* [PATCH V3]mmc: remove MMC bus legacy suspend/resume method
@ 2012-04-10 14:07 Chuanxiao Dong
2012-04-10 14:32 ` Ulf Hansson
0 siblings, 1 reply; 3+ messages in thread
From: Chuanxiao Dong @ 2012-04-10 14:07 UTC (permalink / raw)
To: linux-mmc, linux-pm; +Cc: cjb, linus.walleij, ulf.hansson, rjw
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
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
---
Changes in v2:
use SET_SYSTEM_SLEEP_PM_OPS to define sleep callbacks as Rafael
suggested
Changes in v3:
remove NULL pointer define for runtime callbacks when PM_RUNTIME is not
selected, as Ulf Hansson suggested
drivers/mmc/card/block.c | 2 +-
drivers/mmc/core/bus.c | 24 ++++++------------------
include/linux/mmc/card.h | 2 +-
3 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index f2020d3..3582c03 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1826,7 +1826,7 @@ static void mmc_blk_remove(struct mmc_card *card)
}
#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 *md = mmc_get_drvdata(card);
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 5d011a3..1996c9b 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -122,14 +122,14 @@ static int mmc_bus_remove(struct device *dev)
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_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;
}
@@ -144,8 +144,6 @@ static int mmc_bus_resume(struct device *dev)
return ret;
}
-#ifdef CONFIG_PM_RUNTIME
-
static int mmc_runtime_suspend(struct device *dev)
{
struct mmc_card *card = mmc_dev_to_card(dev);
@@ -166,19 +164,11 @@ static int mmc_runtime_idle(struct device *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,
+ SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume,
+ mmc_runtime_idle)
+ SET_SYSTEM_SLEEP_PM_OPS(mmc_bus_suspend, mmc_bus_resume)
};
-#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 +176,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 1a1ca71..c984c9a 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -480,7 +480,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.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH V3]mmc: remove MMC bus legacy suspend/resume method
2012-04-10 14:07 [PATCH V3]mmc: remove MMC bus legacy suspend/resume method Chuanxiao Dong
@ 2012-04-10 14:32 ` Ulf Hansson
2012-04-11 11:53 ` Dong, Chuanxiao
0 siblings, 1 reply; 3+ messages in thread
From: Ulf Hansson @ 2012-04-10 14:32 UTC (permalink / raw)
To: Chuanxiao Dong
Cc: linux-mmc@vger.kernel.org, linux-pm@lists.linux-foundation.org,
cjb@laptop.org, linus.walleij@linaro.org, rjw@sisk.pl
On 04/10/2012 04:07 PM, Chuanxiao Dong wrote:
> 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
>
> Signed-off-by: Chuanxiao Dong<chuanxiao.dong@intel.com>
> ---
> Changes in v2:
> use SET_SYSTEM_SLEEP_PM_OPS to define sleep callbacks as Rafael
> suggested
>
> Changes in v3:
> remove NULL pointer define for runtime callbacks when PM_RUNTIME is not
> selected, as Ulf Hansson suggested
>
> drivers/mmc/card/block.c | 2 +-
> drivers/mmc/core/bus.c | 24 ++++++------------------
> include/linux/mmc/card.h | 2 +-
> 3 files changed, 8 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
> index f2020d3..3582c03 100644
> --- a/drivers/mmc/card/block.c
> +++ b/drivers/mmc/card/block.c
> @@ -1826,7 +1826,7 @@ static void mmc_blk_remove(struct mmc_card *card)
> }
>
> #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 *md = mmc_get_drvdata(card);
> diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
> index 5d011a3..1996c9b 100644
> --- a/drivers/mmc/core/bus.c
> +++ b/drivers/mmc/core/bus.c
> @@ -122,14 +122,14 @@ static int mmc_bus_remove(struct device *dev)
> 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_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;
> }
>
> @@ -144,8 +144,6 @@ static int mmc_bus_resume(struct device *dev)
> return ret;
> }
>
> -#ifdef CONFIG_PM_RUNTIME
I don't think this "idfef" shall removed. Won't that trigger compiler
warnings when !CONFIG_PM_RUNTIME?
Just remove these three lines from patch v2...
+#define mmc_runtime_suspend NULL
+#define mmc_runtime_resume NULL
+#define mmc_runtime_idle NULL
...and thus the "else" to the CONFIG_PM_RUNTIME, as done below.
> -
> static int mmc_runtime_suspend(struct device *dev)
> {
> struct mmc_card *card = mmc_dev_to_card(dev);
> @@ -166,19 +164,11 @@ static int mmc_runtime_idle(struct device *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,
> + SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume,
> + mmc_runtime_idle)
> + SET_SYSTEM_SLEEP_PM_OPS(mmc_bus_suspend, mmc_bus_resume)
> };
>
> -#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 +176,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 1a1ca71..c984c9a 100644
> --- a/include/linux/mmc/card.h
> +++ b/include/linux/mmc/card.h
> @@ -480,7 +480,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 *);
> };
>
Kind regards
Ulf Hansson
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH V3]mmc: remove MMC bus legacy suspend/resume method
2012-04-10 14:32 ` Ulf Hansson
@ 2012-04-11 11:53 ` Dong, Chuanxiao
0 siblings, 0 replies; 3+ messages in thread
From: Dong, Chuanxiao @ 2012-04-11 11:53 UTC (permalink / raw)
To: Ulf Hansson
Cc: linux-pm@lists.linux-foundation.org, cjb@laptop.org,
linux-mmc@vger.kernel.org
> -----Original Message-----
> From: Ulf Hansson [mailto:ulf.hansson@stericsson.com]
> Sent: Tuesday, April 10, 2012 10:33 PM
> To: Dong, Chuanxiao
> Cc: linux-mmc@vger.kernel.org; linux-pm@lists.linux-foundation.org;
> cjb@laptop.org; linus.walleij@linaro.org; rjw@sisk.pl
> Subject: Re: [PATCH V3]mmc: remove MMC bus legacy suspend/resume method
>
> On 04/10/2012 04:07 PM, Chuanxiao Dong wrote:
> > 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
> >
> > Signed-off-by: Chuanxiao Dong<chuanxiao.dong@intel.com>
> > ---
> > Changes in v2:
> > use SET_SYSTEM_SLEEP_PM_OPS to define sleep callbacks as Rafael
> > suggested
> >
> > Changes in v3:
> > remove NULL pointer define for runtime callbacks when PM_RUNTIME is not
> > selected, as Ulf Hansson suggested
> >
> > drivers/mmc/card/block.c | 2 +-
> > drivers/mmc/core/bus.c | 24 ++++++------------------
> > include/linux/mmc/card.h | 2 +-
> > 3 files changed, 8 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index
> > f2020d3..3582c03 100644
> > --- a/drivers/mmc/card/block.c
> > +++ b/drivers/mmc/card/block.c
> > @@ -1826,7 +1826,7 @@ static void mmc_blk_remove(struct mmc_card *card)
> > }
> >
> > #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 *md = mmc_get_drvdata(card); diff --git
> > a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index
> > 5d011a3..1996c9b 100644
> > --- a/drivers/mmc/core/bus.c
> > +++ b/drivers/mmc/core/bus.c
> > @@ -122,14 +122,14 @@ static int mmc_bus_remove(struct device *dev)
> > 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_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;
> > }
> >
> > @@ -144,8 +144,6 @@ static int mmc_bus_resume(struct device *dev)
> > return ret;
> > }
> >
> > -#ifdef CONFIG_PM_RUNTIME
>
> I don't think this "idfef" shall removed. Won't that trigger compiler warnings
> when !CONFIG_PM_RUNTIME?
Yes, missed this. Will fix it. Thanks a lot!
Thanks
Chuanxiao
>
> Just remove these three lines from patch v2...
>
> +#define mmc_runtime_suspend NULL
> +#define mmc_runtime_resume NULL
> +#define mmc_runtime_idle NULL
>
> ...and thus the "else" to the CONFIG_PM_RUNTIME, as done below.
>
> > -
> > static int mmc_runtime_suspend(struct device *dev)
> > {
> > struct mmc_card *card = mmc_dev_to_card(dev); @@ -166,19 +164,11
> @@
> > static int mmc_runtime_idle(struct device *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,
> > + SET_RUNTIME_PM_OPS(mmc_runtime_suspend, mmc_runtime_resume,
> > + mmc_runtime_idle)
> > + SET_SYSTEM_SLEEP_PM_OPS(mmc_bus_suspend, mmc_bus_resume)
> > };
> >
> > -#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 +176,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
> > 1a1ca71..c984c9a 100644
> > --- a/include/linux/mmc/card.h
> > +++ b/include/linux/mmc/card.h
> > @@ -480,7 +480,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 *);
> > };
> >
>
> Kind regards
> Ulf Hansson
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-11 11:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-10 14:07 [PATCH V3]mmc: remove MMC bus legacy suspend/resume method Chuanxiao Dong
2012-04-10 14:32 ` Ulf Hansson
2012-04-11 11:53 ` Dong, Chuanxiao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox