mmc: block: Move files to core

Once upon a time it made sense to keep the mmc block device driver and its
related code, in its own directory called card. Over time, more an more
functions/structures have become shared through generic mmc header files,
between the core and the card directory. In other words, the relationship
between them has become closer.

By sharing functions/structures via generic header files, it becomes easy
for outside users to abuse them. In a way to avoid that from happen, let's
move the files from card directory into the core directory, as it enables
us to move definitions of functions/structures into mmc core specific
header files.

Note, this is only the first step in providing a cleaner mmc interface for
outside users. Following changes will do the actual cleanup, as that is not
part of this change.

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

1 files changed, 64 insertions, 0 deletions

diff --git a/drivers/mmc/core/queue.h b/drivers/mmc/core/queue.h
new file mode 100644
index 000000000000..dac8c3d010dd
--- /dev/null
+++ b/drivers/mmc/core/queue.h
@@ -0,0 +1,64 @@
+#ifndef MMC_QUEUE_H
+#define MMC_QUEUE_H
+
+static inline bool mmc_req_is_special(struct request *req)
+{
+        return req &&
+                (req_op(req) == REQ_OP_FLUSH ||
+                 req_op(req) == REQ_OP_DISCARD ||
+                 req_op(req) == REQ_OP_SECURE_ERASE);
+}
+
+struct request;
+struct task_struct;
+struct mmc_blk_data;
+
+struct mmc_blk_request {
+        struct mmc_request      mrq;
+        struct mmc_command      sbc;
+        struct mmc_command      cmd;
+        struct mmc_command      stop;
+        struct mmc_data         data;
+        int                     retune_retry_done;
+};
+
+struct mmc_queue_req {
+        struct request          *req;
+        struct mmc_blk_request  brq;
+        struct scatterlist      *sg;
+        char                    *bounce_buf;
+        struct scatterlist      *bounce_sg;
+        unsigned int            bounce_sg_len;
+        struct mmc_async_req    mmc_active;
+};
+
+struct mmc_queue {
+        struct mmc_card         *card;
+        struct task_struct      *thread;
+        struct semaphore        thread_sem;
+        unsigned int            flags;
+#define MMC_QUEUE_SUSPENDED     (1 << 0)
+#define MMC_QUEUE_NEW_REQUEST   (1 << 1)
+        bool                    asleep;
+        struct mmc_blk_data     *blkdata;
+        struct request_queue    *queue;
+        struct mmc_queue_req    *mqrq;
+        struct mmc_queue_req    *mqrq_cur;
+        struct mmc_queue_req    *mqrq_prev;
+        int                     qdepth;
+};
+
+extern int mmc_init_queue(struct mmc_queue *, struct mmc_card *, spinlock_t *,
+                          const char *);
+extern void mmc_cleanup_queue(struct mmc_queue *);
+extern void mmc_queue_suspend(struct mmc_queue *);
+extern void mmc_queue_resume(struct mmc_queue *);
+
+extern unsigned int mmc_queue_map_sg(struct mmc_queue *,
+                                     struct mmc_queue_req *);
+extern void mmc_queue_bounce_pre(struct mmc_queue_req *);
+extern void mmc_queue_bounce_post(struct mmc_queue_req *);
+
+extern int mmc_access_rpmb(struct mmc_queue *);
+
+#endif