[PATCH] update mach-omap2/pm.c for struct subsystem removal

[PATCH] update mach-omap2/pm.c for struct subsystem removal

[Paul Walmsley]

[-- Attachment #1: fix-pm.c-struct-subsystem.patch --]
[-- Type: text/plain, Size: 1593 bytes --]

'struct subsystem' is no more, replaced with 'struct kset': commit
823bccfc4002296ba88c3ad0f049e1abd8108d30.  Fixes the following
warnings:

  CC      arch/arm/mach-omap2/pm.o
arch/arm/mach-omap2/pm.c:410: warning: 'struct subsystem' declared inside parameter list
arch/arm/mach-omap2/pm.c:410: warning: its scope is only this definition or declaration, which is probably not what you want
arch/arm/mach-omap2/pm.c:417: warning: 'struct subsystem' declared inside parameter list
arch/arm/mach-omap2/pm.c:434: warning: initialization from incompatible pointer type
arch/arm/mach-omap2/pm.c:435: warning: initialization from incompatible pointer type

Compile-tested only.

Signed-off-by: Paul Walmsley <paul@pwsan.com>

---
 arch/arm/mach-omap2/pm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-omap-2.6/arch/arm/mach-omap2/pm.c
===================================================================
--- linux-omap-2.6.orig/arch/arm/mach-omap2/pm.c
+++ linux-omap-2.6/arch/arm/mach-omap2/pm.c
@@ -407,12 +407,12 @@ static inline void serial_console_fclk_m
 
 static unsigned short enable_dyn_sleep = 0; /* disabled till drivers are fixed */
 
-static ssize_t omap_pm_sleep_while_idle_show(struct subsystem * subsys, char *buf)
+static ssize_t omap_pm_sleep_while_idle_show(struct kset * subsys, char *buf)
 {
 	return sprintf(buf, "%hu\n", enable_dyn_sleep);
 }
 
-static ssize_t omap_pm_sleep_while_idle_store(struct subsystem * subsys,
+static ssize_t omap_pm_sleep_while_idle_store(struct kset * subsys,
 					      const char * buf,
 					      size_t n)
 {

-- 

Re: [PATCH] update mach-omap2/pm.c for struct subsystem removal

[Tony Lindgren]

* Paul Walmsley <paul@pwsan.com> [070508 14:41]:
> 'struct subsystem' is no more, replaced with 'struct kset': commit
> 823bccfc4002296ba88c3ad0f049e1abd8108d30.  Fixes the following
> warnings:
> 
>   CC      arch/arm/mach-omap2/pm.o
> arch/arm/mach-omap2/pm.c:410: warning: 'struct subsystem' declared inside parameter list
> arch/arm/mach-omap2/pm.c:410: warning: its scope is only this definition or declaration, which is probably not what you want
> arch/arm/mach-omap2/pm.c:417: warning: 'struct subsystem' declared inside parameter list
> arch/arm/mach-omap2/pm.c:434: warning: initialization from incompatible pointer type
> arch/arm/mach-omap2/pm.c:435: warning: initialization from incompatible pointer type
> 
> Compile-tested only.
> 
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> 
> ---
>  arch/arm/mach-omap2/pm.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Index: linux-omap-2.6/arch/arm/mach-omap2/pm.c
> ===================================================================
> --- linux-omap-2.6.orig/arch/arm/mach-omap2/pm.c
> +++ linux-omap-2.6/arch/arm/mach-omap2/pm.c
> @@ -407,12 +407,12 @@ static inline void serial_console_fclk_m
>  
>  static unsigned short enable_dyn_sleep = 0; /* disabled till drivers are fixed */
>  
> -static ssize_t omap_pm_sleep_while_idle_show(struct subsystem * subsys, char *buf)
> +static ssize_t omap_pm_sleep_while_idle_show(struct kset * subsys, char *buf)
>  {
>  	return sprintf(buf, "%hu\n", enable_dyn_sleep);
>  }
>  
> -static ssize_t omap_pm_sleep_while_idle_store(struct subsystem * subsys,
> +static ssize_t omap_pm_sleep_while_idle_store(struct kset * subsys,
>  					      const char * buf,
>  					      size_t n)
>  {
> 

Thanks, pushing today.

Tony