[PATCH v2 1/4] usb: musb: am35x: use SIMPLE_DEV_PM_OPS

[PATCH v2 1/4] usb: musb: am35x: use SIMPLE_DEV_PM_OPS

[Daniel Mack]

This makes am35x_pm_ops const and will stub the struct out in case
CONFIG_PM_SLEEP is not set.

Signed-off-by: Daniel Mack <zonque@gmail.com>
---

I'm resending this series because I've just learned that
SIMPLE_DEV_PM_OPS will stub itself out in case CONFIG_PM_SLEEP is
not set. That makes the the code even smaller.

 drivers/usb/musb/am35x.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c
index 5c310c6..7f1e990 100644
--- a/drivers/usb/musb/am35x.c
+++ b/drivers/usb/musb/am35x.c
@@ -615,23 +615,16 @@ static int am35x_resume(struct device *dev)
 
 	return 0;
 }
-
-static struct dev_pm_ops am35x_pm_ops = {
-	.suspend	= am35x_suspend,
-	.resume		= am35x_resume,
-};
-
-#define DEV_PM_OPS	&am35x_pm_ops
-#else
-#define DEV_PM_OPS	NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(am35x_pm_ops, am35x_suspend, am35x_resume);
+
 static struct platform_driver am35x_driver = {
 	.probe		= am35x_probe,
 	.remove		= am35x_remove,
 	.driver		= {
 		.name	= "musb-am35x",
-		.pm	= DEV_PM_OPS,
+		.pm	= &am35x_pm_ops,
 	},
 };
 
-- 
1.8.3.1

[PATCH v2 2/4] usb: musb: blackfin: use SIMPLE_DEV_PM_OPS

[Daniel Mack]

This makes bfin_pm_ops const and will stub the struct out in case
CONFIG_PM_SLEEP is not set.

Signed-off-by: Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/usb/musb/blackfin.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 72e2056..d9692f7 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -561,23 +561,16 @@ static int bfin_resume(struct device *dev)
 
 	return 0;
 }
-
-static struct dev_pm_ops bfin_pm_ops = {
-	.suspend	= bfin_suspend,
-	.resume		= bfin_resume,
-};

[PATCH v2 3/4] usb: musb: omap2430: use SIMPLE_DEV_PM_OPS

[Daniel Mack]

This makes omap2430_pm_ops const and will stub the struct out in case
CONFIG_PM_SLEEP is not set.

Signed-off-by: Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/usb/musb/omap2430.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 59d2245..be42460 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -659,17 +659,12 @@ static int omap2430_runtime_resume(struct device *dev)
 
 	return 0;
 }
-
-static struct dev_pm_ops omap2430_pm_ops = {
-	.runtime_suspend = omap2430_runtime_suspend,
-	.runtime_resume = omap2430_runtime_resume,
-};

[PATCH v2 4/4] usb: musb: ux500: use SIMPLE_DEV_PM_OPS

[Daniel Mack]

This removes the DEV_PM_OPS macro and brings this file in line with the
other musb platform drivers.

Signed-off-by: Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/usb/musb/ux500.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index 59256b1..f483d19 100644
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -376,17 +376,10 @@ static int ux500_resume(struct device *dev)
 
 	return 0;
 }
-
-static const struct dev_pm_ops ux500_pm_ops = {
-	.suspend	= ux500_suspend,
-	.resume		= ux500_resume,
-};

Re: [PATCH v2 3/4] usb: musb: omap2430: use SIMPLE_DEV_PM_OPS

[Sergei Shtylyov]

Hello.

On 22-09-2013 18:43, Daniel Mack wrote:

> This makes omap2430_pm_ops const and will stub the struct out in case
> CONFIG_PM_SLEEP is not set.

> Signed-off-by: Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>   drivers/usb/musb/omap2430.c | 15 +++++----------
>   1 file changed, 5 insertions(+), 10 deletions(-)

> diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
> index 59d2245..be42460 100644
> --- a/drivers/usb/musb/omap2430.c
> +++ b/drivers/usb/musb/omap2430.c
> @@ -659,17 +659,12 @@ static int omap2430_runtime_resume(struct device *dev)
>
>   	return 0;
>   }
> -
> -static struct dev_pm_ops omap2430_pm_ops = {
> -	.runtime_suspend = omap2430_runtime_suspend,
> -	.runtime_resume = omap2430_runtime_resume,
> -};
> -
> -#define DEV_PM_OPS	(&omap2430_pm_ops)
> -#else
> -#define DEV_PM_OPS	NULL
>   #endif
>
> +static SIMPLE_DEV_PM_OPS(omap2430_pm_ops,
> +			 omap2430_runtime_suspend,
> +			 omap2430_runtime_resume);

    No, SIMPLE_DEV_PM_OPS() won't do here, it's runtime PM, didn't you see?

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 3/4] usb: musb: omap2430: use SIMPLE_DEV_PM_OPS

[Daniel Mack]

On 22.09.2013 16:59, Sergei Shtylyov wrote:
> On 22-09-2013 18:43, Daniel Mack wrote:
> 
>> This makes omap2430_pm_ops const and will stub the struct out in case
>> CONFIG_PM_SLEEP is not set.
> 
>> Signed-off-by: Daniel Mack <zonque-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> ---
>>   drivers/usb/musb/omap2430.c | 15 +++++----------
>>   1 file changed, 5 insertions(+), 10 deletions(-)
> 
>> diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
>> index 59d2245..be42460 100644
>> --- a/drivers/usb/musb/omap2430.c
>> +++ b/drivers/usb/musb/omap2430.c
>> @@ -659,17 +659,12 @@ static int omap2430_runtime_resume(struct device *dev)
>>
>>   	return 0;
>>   }
>> -
>> -static struct dev_pm_ops omap2430_pm_ops = {
>> -	.runtime_suspend = omap2430_runtime_suspend,
>> -	.runtime_resume = omap2430_runtime_resume,
>> -};
>> -
>> -#define DEV_PM_OPS	(&omap2430_pm_ops)
>> -#else
>> -#define DEV_PM_OPS	NULL
>>   #endif
>>
>> +static SIMPLE_DEV_PM_OPS(omap2430_pm_ops,
>> +			 omap2430_runtime_suspend,
>> +			 omap2430_runtime_resume);
> 
>     No, SIMPLE_DEV_PM_OPS() won't do here, it's runtime PM, didn't you see?

Eh, you're right, sorry. Whoever applies this series, just drop that one
patch. The rest of this series is not affected.

Sergei, thanks for the review again :)


Daniel

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html