>From 02a7cef488a9e94a6dd290946a497fb167eb774b Mon Sep 17 00:00:00 2001 From: Yunpeng Gao <[email protected]> Date: Thu, 16 Dec 2010 19:53:27 +0800 Subject: [PATCH] Enable runtime PM support for block driver of mmc stack
Follow the kernel runtime PM framework, this patch enables runtime PM support for block driver of mmc stack. Signed-off-by: Yunpeng Gao <[email protected]> --- drivers/mmc/card/block.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index dcab2c5..fc80ee6 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -31,6 +31,7 @@ #include <linux/mutex.h> #include <linux/scatterlist.h> #include <linux/string_helpers.h> +#include <linux/pm_runtime.h> #include <linux/mmc/card.h> #include <linux/mmc/host.h> @@ -560,14 +561,19 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *req) static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) { - if (req->cmd_flags & REQ_DISCARD) { -// if (req->cmd_flags & REQ_SECURE) -// return mmc_blk_issue_secdiscard_rq(mq, req); -// else - return mmc_blk_issue_discard_rq(mq, req); - } else { - return mmc_blk_issue_rw_rq(mq, req); - } + struct mmc_blk_data *md = mq->data; + struct mmc_card *card = md->queue.card; + int ret; + + pm_runtime_get_sync(&card->dev); + + if (req->cmd_flags & REQ_DISCARD) + ret = mmc_blk_issue_discard_rq(mq, req); + else + ret = mmc_blk_issue_rw_rq(mq, req); + + pm_runtime_put(&card->dev); + return ret; } static inline int mmc_blk_readonly(struct mmc_card *card) @@ -709,6 +715,11 @@ static int mmc_blk_probe(struct mmc_card *card) mmc_set_drvdata(card, md); add_disk(md->disk); + + /* Indicate to runtime PM core that our device is active */ + pm_runtime_set_active(&card->dev); + pm_runtime_enable(&card->dev); + return 0; out: @@ -732,6 +743,7 @@ static void mmc_blk_remove(struct mmc_card *card) mmc_blk_put(md); } mmc_set_drvdata(card, NULL); + pm_runtime_disable(&card->dev); } #ifdef CONFIG_PM -- 1.5.4.5 _______________________________________________ MeeGo-kernel mailing list [email protected] http://lists.meego.com/listinfo/meego-kernel
