From abc0b941109ac544fa40127f4ab44575008096c9 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 25 May 2011 23:08:44 +0200 Subject: [PATCH 50/69] Revert "mmc: add none blocking mmc request function" This reverts commit 63633272709773487926b8116dbfac918176d07d. --- drivers/mmc/core/core.c | 78 ++++++---------------------------------------- include/linux/mmc/core.h | 9 +----- include/linux/mmc/host.h | 9 ----- 3 files changed, 11 insertions(+), 85 deletions(-) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index e88dd36..1f453ac 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -198,75 +198,10 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) static void mmc_wait_done(struct mmc_request *mrq) { - complete(&mrq->completion); + complete(mrq->done_data); } /** - * mmc_pre_req - Prepare for a new request - * @host: MMC host to prepare command - * @mrq: MMC request to prepare for - * @is_first_req: true if there is no previous started request - * that may run in parellel to this call, otherwise false - * - * mmc_pre_req() is called in prior to mmc_start_req() to let - * host prepare for the new request. Preparation of a request may be - * performed while another request is running on the host. - */ -void mmc_pre_req(struct mmc_host *host, struct mmc_request *mrq, - bool is_first_req) -{ - if (host->ops->pre_req) - host->ops->pre_req(host, mrq, is_first_req); -} -EXPORT_SYMBOL(mmc_pre_req); - -/** - * mmc_post_req - Post process a completed request - * @host: MMC host to post process command - * @mrq: MMC request to post process for - * @err: Error, if none zero, clean up any resources made in pre_req - * - * Let the host post process a completed request. Post processing of - * a request may be performed while another reuqest is running. - */ -void mmc_post_req(struct mmc_host *host, struct mmc_request *mrq, int err) -{ - if (host->ops->post_req) - host->ops->post_req(host, mrq, err); -} -EXPORT_SYMBOL(mmc_post_req); - -/** - * mmc_start_req - start a request - * @host: MMC host to start command - * @mrq: MMC request to start - * - * Start a new MMC custom command request for a host. - * Does not wait for the command to complete. - */ -void mmc_start_req(struct mmc_host *host, struct mmc_request *mrq) -{ - init_completion(&mrq->completion); - mrq->done = mmc_wait_done; - - mmc_start_request(host, mrq); -} -EXPORT_SYMBOL(mmc_start_req); - -/** - * mmc_wait_for_req_done - wait for completion of request - * @mrq: MMC request to wait for - * - * Wait for the command to complete. Does not attempt to parse the - * response. - */ -void mmc_wait_for_req_done(struct mmc_request *mrq) -{ - wait_for_completion(&mrq->completion); -} -EXPORT_SYMBOL(mmc_wait_for_req_done); - -/** * mmc_wait_for_req - start a request and wait for completion * @host: MMC host to start command * @mrq: MMC request to start @@ -277,9 +212,16 @@ EXPORT_SYMBOL(mmc_wait_for_req_done); */ void mmc_wait_for_req(struct mmc_host *host, struct mmc_request *mrq) { - mmc_start_req(host, mrq); - mmc_wait_for_req_done(mrq); + DECLARE_COMPLETION_ONSTACK(complete); + + mrq->done_data = &complete; + mrq->done = mmc_wait_done; + + mmc_start_request(host, mrq); + + wait_for_completion(&complete); } + EXPORT_SYMBOL(mmc_wait_for_req); /** diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h index 5bbfb71..07f27af 100644 --- a/include/linux/mmc/core.h +++ b/include/linux/mmc/core.h @@ -117,7 +117,6 @@ struct mmc_data { unsigned int sg_len; /* size of scatter list */ struct scatterlist *sg; /* I/O scatter list */ - s32 host_cookie; /* host private data */ }; struct mmc_request { @@ -125,19 +124,13 @@ struct mmc_request { struct mmc_data *data; struct mmc_command *stop; - struct completion completion; + void *done_data; /* completion data */ void (*done)(struct mmc_request *);/* completion function */ }; struct mmc_host; struct mmc_card; -extern void mmc_pre_req(struct mmc_host *host, struct mmc_request *mrq, - bool is_first_req); -extern void mmc_post_req(struct mmc_host *host, struct mmc_request *mrq, - int err); -extern void mmc_start_req(struct mmc_host *host, struct mmc_request *mrq); -extern void mmc_wait_for_req_done(struct mmc_request *mrq); extern void mmc_wait_for_req(struct mmc_host *, struct mmc_request *); extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int); extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *, diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index c056a3d..bcb793e 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -88,15 +88,6 @@ struct mmc_host_ops { */ int (*enable)(struct mmc_host *host); int (*disable)(struct mmc_host *host, int lazy); - /* - * It is optional for the host to implement pre_req and post_req in - * order to support double buffering of requests (prepare one - * request while another request is active). - */ - void (*post_req)(struct mmc_host *host, struct mmc_request *req, - int err); - void (*pre_req)(struct mmc_host *host, struct mmc_request *req, - bool is_first_req); void (*request)(struct mmc_host *host, struct mmc_request *req); /* * Avoid calling these three functions too often or in a "fast path", -- 1.7.2.5