Datta, Shubhrajyoti wrote:
Hi Dmitry, On Mon, Jan 9, 2012 at 11:34 PM, Dmitry Shmidt <dimitrysh@xxxxxxxxxx> wrote:Signed-off-by: Dmitry Shmidt <dimitrysh@xxxxxxxxxx> --- drivers/mmc/card/block.c | 4 ++-- drivers/mmc/core/bus.c | 27 +++++++++------------------ include/linux/mmc/card.h | 2 +- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 1e0e27c..5724ae1 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1676,8 +1676,8 @@ static void mmc_blk_remove(struct mmc_card *card) mmc_set_drvdata(card, NULL); } -#ifdef CONFIG_PM -static int mmc_blk_suspend(struct mmc_card *card, pm_message_t state) +#ifdef CONFIG_PM_SLEEP +static int mmc_blk_suspend(struct mmc_card *card) { struct mmc_blk_data *part_md; struct mmc_blk_data *md = mmc_get_drvdata(card); diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index 6be4924..f325aa6 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c @@ -122,18 +122,19 @@ static int mmc_bus_remove(struct device *dev) return 0; } -static int mmc_bus_suspend(struct device *dev, pm_message_t state) +#ifdef CONFIG_PM_SLEEP +static int mmc_bus_pm_suspend(struct device *dev)Was the name change intentional.
I believe there should be no reason for changing these names (same for mmc_bus_resume). Otherwise, great! You will have my Ack!
BR Ulf Hansson -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
