mmc: Undo mmc changes that diverge us from upstream
All this is useless diff from mainline, so undo the changes to
get us closer to mainline.
Change-Id: I782f4ac0f82aabda7a5a0f547982df26e67abe92
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 169ccf1..0e024dd 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -57,7 +57,6 @@
{
struct mmc_queue *mq = d;
struct request_queue *q = mq->queue;
- struct request *req;
struct mmc_card *card = mq->card;
current->flags |= PF_MEMALLOC;
@@ -65,7 +64,7 @@
down(&mq->thread_sem);
do {
struct mmc_queue_req *tmp;
- req = NULL; /* Must be set to NULL at each iteration */
+ struct request *req = NULL;
spin_lock_irq(q->queue_lock);
set_current_state(TASK_INTERRUPTIBLE);