2013-07-05 22:45:04

by Shuah Khan

[permalink] [raw]
Subject: [PATCH] arm: Convert sa1111 platform and bus legacy pm_ops to dev_pm_ops

Convert arch/arm/common/sa1111 platform and bus legacy pm_ops to dev_pm_ops.
This change also updates the use of COMFIG_PM to CONFIG_PM_SLEEP as this
platform and bus code implements PM_SLEEP ops and not the PM_RUNTIME ops.
Compile tested.

Signed-off-by: Shuah Khan <[email protected]>
---
arch/arm/common/sa1111.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 2a64c12..95594f0 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -1321,7 +1321,7 @@ static int sa1111_bus_resume(struct device *dev)
}
static SIMPLE_DEV_PM_OPS(sa1111_bus_dev_pm_ops, sa1111_bus_suspend,
sa1111_bus_resume);
-#endif
+#endif

static void sa1111_bus_shutdown(struct device *dev)
{
--
1.7.10.4


2013-07-05 22:48:10

by Sergei Shtylyov

[permalink] [raw]
Subject: Re: [PATCH] arm: Convert sa1111 platform and bus legacy pm_ops to dev_pm_ops

Hello.

On 07/06/2013 02:44 AM, Shuah Khan wrote:

> Convert arch/arm/common/sa1111 platform and bus legacy pm_ops to dev_pm_ops.
> This change also updates the use of COMFIG_PM to CONFIG_PM_SLEEP as this
> platform and bus code implements PM_SLEEP ops and not the PM_RUNTIME ops.
> Compile tested.

It may be compile tested but the patch description doesn't match the
patch (which is a simple trailing space fix).

> Signed-off-by: Shuah Khan <[email protected]>
> ---
> arch/arm/common/sa1111.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
> index 2a64c12..95594f0 100644
> --- a/arch/arm/common/sa1111.c
> +++ b/arch/arm/common/sa1111.c
> @@ -1321,7 +1321,7 @@ static int sa1111_bus_resume(struct device *dev)
> }
> static SIMPLE_DEV_PM_OPS(sa1111_bus_dev_pm_ops, sa1111_bus_suspend,
> sa1111_bus_resume);
> -#endif
> +#endif

WBR, Sergei

2013-07-05 22:48:30

by Russell King - ARM Linux

[permalink] [raw]
Subject: Re: [PATCH] arm: Convert sa1111 platform and bus legacy pm_ops to dev_pm_ops

On Fri, Jul 05, 2013 at 04:44:57PM -0600, Shuah Khan wrote:
> Convert arch/arm/common/sa1111 platform and bus legacy pm_ops to dev_pm_ops.
> This change also updates the use of COMFIG_PM to CONFIG_PM_SLEEP as this
> platform and bus code implements PM_SLEEP ops and not the PM_RUNTIME ops.
> Compile tested.

Err...

> diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
> index 2a64c12..95594f0 100644
> --- a/arch/arm/common/sa1111.c
> +++ b/arch/arm/common/sa1111.c
> @@ -1321,7 +1321,7 @@ static int sa1111_bus_resume(struct device *dev)
> }
> static SIMPLE_DEV_PM_OPS(sa1111_bus_dev_pm_ops, sa1111_bus_suspend,
> sa1111_bus_resume);
> -#endif
> +#endif

Patch doesn't match description.

2013-07-05 22:49:25

by Shuah Khan

[permalink] [raw]
Subject: Re: [PATCH] arm: Convert sa1111 platform and bus legacy pm_ops to dev_pm_ops

On 07/05/2013 04:45 PM, Shuah Khan wrote:
> Convert arch/arm/common/sa1111 platform and bus legacy pm_ops to dev_pm_ops.
> This change also updates the use of COMFIG_PM to CONFIG_PM_SLEEP as this
> platform and bus code implements PM_SLEEP ops and not the PM_RUNTIME ops.
> Compile tested.
>
> Signed-off-by: Shuah Khan <[email protected]>
> ---
> arch/arm/common/sa1111.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
> index 2a64c12..95594f0 100644
> --- a/arch/arm/common/sa1111.c
> +++ b/arch/arm/common/sa1111.c
> @@ -1321,7 +1321,7 @@ static int sa1111_bus_resume(struct device *dev)
> }
> static SIMPLE_DEV_PM_OPS(sa1111_bus_dev_pm_ops, sa1111_bus_suspend,
> sa1111_bus_resume);
> -#endif
> +#endif
>
> static void sa1111_bus_shutdown(struct device *dev)
> {
>

Please ignore this patch - it is not correct.

-- Shuah

--
Shuah Khan, Linux Kernel Developer - Open Source Group Samsung Research
America (Silicon Valley) [email protected] | (970) 672-0658