Skip to contentSkip to conversation

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

PATCH In review Paul Walmsley 2 participants 2 messages May 8, 2007 1 message not in the archive

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP power management support
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Paul Walmsley

author
#1 lore raw

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

'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 <[email protected]>
---
 arch/arm/mach-omap2/pm.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/pm.c +2 -2
Index: 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)
 {
maintainer
#2 lore raw
Quoted 29 lines · Paul Walmsley

'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 <[email protected]>
---
 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
===================================================================

arch/arm/mach-omap2/pm.c +0 -1
@@ -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)

arch/arm/mach-omap2/pm.c static inline void serial_console_fclk_m · line 418

Quoted 10 lines
arch/arm/mach-omap2/pm.c +2 -1
+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