mmc: card: do away with indirection pointer

We have enough vtables in the kernel as it is, we don't need
this one to create even more artificial separation of concerns.

As is proved by the Makefile:

obj-$(CONFIG_MMC_BLOCK)         += mmc_block.o
mmc_block-objs                  := block.o queue.o

block.c and queue.c are baked into the same mmc_block.o object.
So why would one of these objects access a function in the
other object by dereferencing a pointer?

Create a new block.h header file for the single shared function
from block to queue and remove the function pointer and just
call the queue request function.

Apart from making the code more readable, this also makes link
optimizations possible and probably speeds up the call as well.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

4 files changed, 5 insertions, 5 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 03670aa5ac8e..c3335112e68c 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2144,7 +2144,7 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc)
         return 0;
 }
 
-static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
+int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
 {
         int ret;
         struct mmc_blk_data *md = mq->data;
@@ -2265,7 +2265,6 @@ again:
         if (ret)
                 goto err_putdisk;
 
-        md->queue.issue_fn = mmc_blk_issue_rq;
         md->queue.data = md;
 
         md->disk->major = MMC_BLOCK_MAJOR;
diff --git a/drivers/mmc/card/block.h b/drivers/mmc/card/block.h
new file mode 100644
index 000000000000..cdabb2ee74be
--- /dev/null
+++ b/drivers/mmc/card/block.h
@@ -0,0 +1 @@
+int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req);
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c
index 708057261b38..8037f73a109a 100644
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
@@ -19,7 +19,9 @@
 
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
+
 #include "queue.h"
+#include "block.h"
 
 #define MMC_QUEUE_BOUNCESZ      65536
 
@@ -68,7 +70,7 @@ static int mmc_queue_thread(void *d)
                         bool req_is_special = mmc_req_is_special(req);
 
                         set_current_state(TASK_RUNNING);
-                        mq->issue_fn(mq, req);
+                        mmc_blk_issue_rq(mq, req);
                         cond_resched();
                         if (mq->flags & MMC_QUEUE_NEW_REQUEST) {
                                 mq->flags &= ~MMC_QUEUE_NEW_REQUEST;
diff --git a/drivers/mmc/card/queue.h b/drivers/mmc/card/queue.h
index fee5e1271465..3c15a75bae86 100644
--- a/drivers/mmc/card/queue.h
+++ b/drivers/mmc/card/queue.h
@@ -57,8 +57,6 @@ struct mmc_queue {
         unsigned int            flags;
 #define MMC_QUEUE_SUSPENDED     (1 << 0)
 #define MMC_QUEUE_NEW_REQUEST   (1 << 1)
-
-        int                     (*issue_fn)(struct mmc_queue *, struct request *);
         void                    *data;
         struct request_queue    *queue;
         struct mmc_queue_req    mqrq[2];