* [PATCH V3] mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used
@ 2012-01-09 18:04 Dmitry Shmidt
2012-01-10 7:12 ` Datta, Shubhrajyoti
0 siblings, 1 reply; 4+ messages in thread
From: Dmitry Shmidt @ 2012-01-09 18:04 UTC (permalink / raw)
To: linux-mmc
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---
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)
{
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;
}
-static int mmc_bus_resume(struct device *dev)
+static int mmc_bus_pm_resume(struct device *dev)
{
struct mmc_driver *drv = to_mmc_driver(dev->driver);
struct mmc_card *card = mmc_dev_to_card(dev);
@@ -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_pm_suspend, mmc_bus_pm_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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH V3] mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used
2012-01-09 18:04 [PATCH V3] mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used Dmitry Shmidt
@ 2012-01-10 7:12 ` Datta, Shubhrajyoti
2012-01-10 8:47 ` Ulf Hansson
2012-01-10 18:05 ` Dmitry Shmidt
0 siblings, 2 replies; 4+ messages in thread
From: Datta, Shubhrajyoti @ 2012-01-10 7:12 UTC (permalink / raw)
To: Dmitry Shmidt; +Cc: linux-mmc
Hi Dmitry,
On Mon, Jan 9, 2012 at 11:34 PM, Dmitry Shmidt <dimitrysh@google.com> wrote:
> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
> ---
> 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.
> {
> 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;
> }
>
> -static int mmc_bus_resume(struct device *dev)
> +static int mmc_bus_pm_resume(struct device *dev)
> {
> struct mmc_driver *drv = to_mmc_driver(dev->driver);
> struct mmc_card *card = mmc_dev_to_card(dev);
> @@ -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_pm_suspend, mmc_bus_pm_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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V3] mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used
2012-01-10 7:12 ` Datta, Shubhrajyoti
@ 2012-01-10 8:47 ` Ulf Hansson
2012-01-10 18:05 ` Dmitry Shmidt
1 sibling, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2012-01-10 8:47 UTC (permalink / raw)
To: Dmitry Shmidt; +Cc: Datta, Shubhrajyoti, linux-mmc@vger.kernel.org
Datta, Shubhrajyoti wrote:
> Hi Dmitry,
>
>
> On Mon, Jan 9, 2012 at 11:34 PM, Dmitry Shmidt <dimitrysh@google.com> wrote:
>> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
>> ---
>> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V3] mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used
2012-01-10 7:12 ` Datta, Shubhrajyoti
2012-01-10 8:47 ` Ulf Hansson
@ 2012-01-10 18:05 ` Dmitry Shmidt
1 sibling, 0 replies; 4+ messages in thread
From: Dmitry Shmidt @ 2012-01-10 18:05 UTC (permalink / raw)
To: Datta, Shubhrajyoti; +Cc: linux-mmc
On Mon, Jan 9, 2012 at 11:12 PM, Datta, Shubhrajyoti
<shubhrajyoti@ti.com> wrote:
> Hi Dmitry,
>
>
> On Mon, Jan 9, 2012 at 11:34 PM, Dmitry Shmidt <dimitrysh@google.com> wrote:
>> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
>> ---
>> 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.
Yes, I didn't want to mix "old" suspend style functions with new ones.
>
>> {
>> 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;
>> }
>>
>> -static int mmc_bus_resume(struct device *dev)
>> +static int mmc_bus_pm_resume(struct device *dev)
>> {
>> struct mmc_driver *drv = to_mmc_driver(dev->driver);
>> struct mmc_card *card = mmc_dev_to_card(dev);
>> @@ -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_pm_suspend, mmc_bus_pm_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 majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-01-10 18:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-09 18:04 [PATCH V3] mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used Dmitry Shmidt
2012-01-10 7:12 ` Datta, Shubhrajyoti
2012-01-10 8:47 ` Ulf Hansson
2012-01-10 18:05 ` Dmitry Shmidt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox