[PATCH] [POWERPC] fix warning in pseries/power.c

[PATCH] [POWERPC] fix warning in pseries/power.c

[Stephen Rothwell]

Introduced by commit 79393fc46ede43451a500a132e5de9856f5a4c83 ("kobject:
convert pseries/power.c to kobj_attr interface").

sys_create_file takes a "struct attrbute *" not a "struct kobj_addribute *".

arch/powerpc/platforms/pseries/power.c: In function 'apo_pm_init':
arch/powerpc/platforms/pseries/power.c:78: warning: passing argument 2 of 'sysfs_create_file' from incompatible pointer type

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/powerpc/platforms/pseries/power.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/power.c b/arch/powerpc/platforms/pseries/power.c
index e95fc15..6d62662 100644
--- a/arch/powerpc/platforms/pseries/power.c
+++ b/arch/powerpc/platforms/pseries/power.c
@@ -75,7 +75,7 @@ core_initcall(pm_init);
 #else
 static int __init apo_pm_init(void)
 {
-	return (sysfs_create_file(power_kobj, &auto_poweron_attr));
+	return (sysfs_create_file(power_kobj, &auto_poweron_attr.attr));
 }
 __initcall(apo_pm_init);
 #endif
-- 
1.5.4.2

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

patch powerpc-fix-typo-in-pseries-power.c.patch added to gregkh-2.6 tree

[gregkh]

This is a note to let you know that I've just added the patch titled

     Subject: POWERPC: fix typo in pseries/power.c

to my gregkh-2.6 tree.  Its filename is

     powerpc-fix-typo-in-pseries-power.c.patch

This tree can be found at 
    http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/


>From sfr@canb.auug.org.au  Wed Feb 20 12:57:53 2008
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2008 11:27:04 +1100
Subject: POWERPC: fix typo in pseries/power.c
To: paulus@samba.org
Cc: ppc-dev <linuxppc-dev@ozlabs.org>, Greg KH <greg@kroah.com>
Message-ID: <20080220112704.0ac7d7f2.sfr@canb.auug.org.au>


Introduced by commit 79393fc46ede43451a500a132e5de9856f5a4c83 ("kobject:
convert pseries/power.c to kobj_attr interface").

sys_create_file takes a "struct attrbute *" not a "struct kobj_addribute *".

arch/powerpc/platforms/pseries/power.c: In function 'apo_pm_init':
arch/powerpc/platforms/pseries/power.c:78: warning: passing argument 2 of 'sysfs_create_file' from incompatible pointer type

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Mackerras <paulus@au.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 arch/powerpc/platforms/pseries/power.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/powerpc/platforms/pseries/power.c
+++ b/arch/powerpc/platforms/pseries/power.c
@@ -75,7 +75,7 @@ core_initcall(pm_init);
 #else
 static int __init apo_pm_init(void)
 {
-	return (sysfs_create_file(power_kobj, &auto_poweron_attr));
+	return (sysfs_create_file(power_kobj, &auto_poweron_attr.attr));
 }
 __initcall(apo_pm_init);
 #endif


Patches currently in gregkh-2.6 which might be from sfr@canb.auug.org.au are

bad/battery-class-driver.patch
driver/powerpc-fix-typo-in-pseries-power.c.patch

Re: patch powerpc-fix-typo-in-pseries-power.c.patch added to gregkh-2.6 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

Hi Greg,

On Wed, 20 Feb 2008 13:57:27 -0800 <gregkh@suse.de> wrote:
>
> This is a note to let you know that I've just added the patch titled
> 
>      Subject: POWERPC: fix typo in pseries/power.c
> 
> to my gregkh-2.6 tree.  Its filename is
> 
>      powerpc-fix-typo-in-pseries-power.c.patch

This patch has been included by Paulus in his latest pull request to Linus.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: patch powerpc-fix-typo-in-pseries-power.c.patch added to gregkh-2.6 tree

[Greg KH]

On Thu, Feb 21, 2008 at 10:32:25AM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> On Wed, 20 Feb 2008 13:57:27 -0800 <gregkh@suse.de> wrote:
> >
> > This is a note to let you know that I've just added the patch titled
> > 
> >      Subject: POWERPC: fix typo in pseries/power.c
> > 
> > to my gregkh-2.6 tree.  Its filename is
> > 
> >      powerpc-fix-typo-in-pseries-power.c.patch
> 
> This patch has been included by Paulus in his latest pull request to Linus.

Ok, I'll drop it when it shows up in Linus's tree.  Not a big deal :)

thanks,

greg k-h