mmc: remove MMC bus legacy suspend/resume method
MMC bus is using legacy suspend/resume method, which is not compatible if runtime pm callbacks are used. In this scenario, MMC bus suspend/resume callbacks cannot be called when system entering S3. So change to use the new defined dev_pm_ops for system sleeping mode. Tested on AM335x Platform. Solves major issue/crash reported at http://www.mail-archive.com/linux-omap@vger.kernel.org/msg65425.html Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com> Tested-by: Hebbar, Gururaja <gururaja.hebbar@ti.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Ulf Hansson <ulf.hansson@stericsson.com> Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
parent
4d048f915f
commit
32d317c60e
|
@ -1824,7 +1824,7 @@ static void mmc_blk_remove(struct mmc_card *card)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
static int mmc_blk_suspend(struct mmc_card *card, pm_message_t state)
|
static int mmc_blk_suspend(struct mmc_card *card)
|
||||||
{
|
{
|
||||||
struct mmc_blk_data *part_md;
|
struct mmc_blk_data *part_md;
|
||||||
struct mmc_blk_data *md = mmc_get_drvdata(card);
|
struct mmc_blk_data *md = mmc_get_drvdata(card);
|
||||||
|
|
|
@ -122,14 +122,14 @@ static int mmc_bus_remove(struct device *dev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int mmc_bus_suspend(struct device *dev, pm_message_t state)
|
static int mmc_bus_suspend(struct device *dev)
|
||||||
{
|
{
|
||||||
struct mmc_driver *drv = to_mmc_driver(dev->driver);
|
struct mmc_driver *drv = to_mmc_driver(dev->driver);
|
||||||
struct mmc_card *card = mmc_dev_to_card(dev);
|
struct mmc_card *card = mmc_dev_to_card(dev);
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (dev->driver && drv->suspend)
|
if (dev->driver && drv->suspend)
|
||||||
ret = drv->suspend(card, state);
|
ret = drv->suspend(card);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -165,20 +165,14 @@ static int mmc_runtime_idle(struct device *dev)
|
||||||
return pm_runtime_suspend(dev);
|
return pm_runtime_suspend(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
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,
|
|
||||||
};
|
|
||||||
|
|
||||||
#define MMC_PM_OPS_PTR (&mmc_bus_pm_ops)
|
|
||||||
|
|
||||||
#else /* !CONFIG_PM_RUNTIME */
|
|
||||||
|
|
||||||
#define MMC_PM_OPS_PTR NULL
|
|
||||||
|
|
||||||
#endif /* !CONFIG_PM_RUNTIME */
|
#endif /* !CONFIG_PM_RUNTIME */
|
||||||
|
|
||||||
|
static const struct dev_pm_ops mmc_bus_pm_ops = {
|
||||||
|
SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume,
|
||||||
|
mmc_runtime_idle)
|
||||||
|
SET_SYSTEM_SLEEP_PM_OPS(mmc_bus_suspend, mmc_bus_resume)
|
||||||
|
};
|
||||||
|
|
||||||
static struct bus_type mmc_bus_type = {
|
static struct bus_type mmc_bus_type = {
|
||||||
.name = "mmc",
|
.name = "mmc",
|
||||||
.dev_attrs = mmc_dev_attrs,
|
.dev_attrs = mmc_dev_attrs,
|
||||||
|
@ -186,9 +180,7 @@ static struct bus_type mmc_bus_type = {
|
||||||
.uevent = mmc_bus_uevent,
|
.uevent = mmc_bus_uevent,
|
||||||
.probe = mmc_bus_probe,
|
.probe = mmc_bus_probe,
|
||||||
.remove = mmc_bus_remove,
|
.remove = mmc_bus_remove,
|
||||||
.suspend = mmc_bus_suspend,
|
.pm = &mmc_bus_pm_ops,
|
||||||
.resume = mmc_bus_resume,
|
|
||||||
.pm = MMC_PM_OPS_PTR,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
int mmc_register_bus(void)
|
int mmc_register_bus(void)
|
||||||
|
|
|
@ -481,7 +481,7 @@ struct mmc_driver {
|
||||||
struct device_driver drv;
|
struct device_driver drv;
|
||||||
int (*probe)(struct mmc_card *);
|
int (*probe)(struct mmc_card *);
|
||||||
void (*remove)(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 *);
|
int (*resume)(struct mmc_card *);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue