2012/1/10 Dmitry Shmidt <dimitr...@google.com>: > Signed-off-by: Dmitry Shmidt <dimitr...@google.com>
Hi Dmitry, after you move mmc_bus_suspend, mmc_bus_resume to dev_pm_ops, while doing hiberantion by swsusp, suspend/resume will not be called by the hibernation flow since it will move to call freeze/thaw/restore. if we don't stop blk queue for SD while doing hibernation, SD card will hang in the processing of restoring system. pls note Bin's patch "mmc: core: move suspend/resume to dev_pm_ops and add hibernation support" http://www.spinics.net/lists/linux-mmc/msg12007.html he has done some duplicated job with you except adding swsusp support. -barry > --- > drivers/mmc/card/block.c | 4 ++-- > drivers/mmc/core/bus.c | 25 ++++++++----------------- > include/linux/mmc/card.h | 2 +- > 3 files changed, 11 insertions(+), 20 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..bf8ad29 100644 > --- a/drivers/mmc/core/bus.c > +++ b/drivers/mmc/core/bus.c > @@ -122,14 +122,15 @@ 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_suspend(struct device *dev) > { > struct mmc_driver *drv = to_mmc_driver(dev->driver); > struct mmc_card *card = mmc_dev_to_card(dev); > int ret = 0; > > if (dev->driver && drv->suspend) > - ret = drv->suspend(card, state); > + ret = drv->suspend(card); > return ret; > } > > @@ -143,9 +144,9 @@ static int mmc_bus_resume(struct device *dev) > ret = drv->resume(card); > return ret; > } > +#endif /* CONFIG_PM_SLEEP */ > > #ifdef CONFIG_PM_RUNTIME > - > static int mmc_runtime_suspend(struct device *dev) > { > struct mmc_card *card = mmc_dev_to_card(dev); > @@ -164,21 +165,13 @@ static int mmc_runtime_idle(struct device *dev) > { > return pm_runtime_suspend(dev); > } > +#endif /* CONFIG_PM_RUNTIME */ > > static const struct dev_pm_ops mmc_bus_pm_ops = { > - .runtime_suspend = mmc_runtime_suspend, > - .runtime_resume = mmc_runtime_resume, > - .runtime_idle = mmc_runtime_idle, > + SET_SYSTEM_SLEEP_PM_OPS(mmc_bus_suspend, mmc_bus_resume) > + SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume, > mmc_runtime_idle) > }; > > -#define MMC_PM_OPS_PTR (&mmc_bus_pm_ops) > - > -#else /* !CONFIG_PM_RUNTIME */ > - > -#define MMC_PM_OPS_PTR NULL > - > -#endif /* !CONFIG_PM_RUNTIME */ > - > static struct bus_type mmc_bus_type = { > .name = "mmc", > .dev_attrs = mmc_dev_attrs, > @@ -186,9 +179,7 @@ static struct bus_type mmc_bus_type = { > .uevent = mmc_bus_uevent, > .probe = mmc_bus_probe, > .remove = mmc_bus_remove, > - .suspend = mmc_bus_suspend, > - .resume = mmc_bus_resume, > - .pm = MMC_PM_OPS_PTR, > + .pm = &mmc_bus_pm_ops, > }; > > int mmc_register_bus(void) > diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h > index c8ef9bc..80caf1d 100644 > --- a/include/linux/mmc/card.h > +++ b/include/linux/mmc/card.h > @@ -455,7 +455,7 @@ struct mmc_driver { > struct device_driver drv; > int (*probe)(struct mmc_card *); > void (*remove)(struct mmc_card *); > - int (*suspend)(struct mmc_card *, pm_message_t); > + int (*suspend)(struct mmc_card *); > int (*resume)(struct mmc_card *); > }; > > -- > 1.7.3.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
