]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
powerpc: Fix bugs introduced by sysfs changes
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 26 Mar 2009 19:29:06 +0000 (19:29 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 27 Mar 2009 05:58:24 +0000 (16:58 +1100)
Rusty's patch to change our sysfs access to various registers
to use smp_call_function_single() introduced a whole bunch of
warnings. This fixes them. This version also fixes an actual
bug in here where it did mtspr instead of mfspr when reading
the files

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/kernel/sysfs.c

index e6cd6c990c25af99595b4019596d1ef8f3f86cf9..f41aec85aa497b1dd90c6da64d9e8389c22c80e1 100644 (file)
@@ -134,17 +134,15 @@ void ppc_enable_pmcs(void)
 }
 EXPORT_SYMBOL(ppc_enable_pmcs);
 
-
 #define SYSFS_PMCSETUP(NAME, ADDRESS) \
 static void read_##NAME(void *val) \
 { \
-       mtspr(ADDRESS, *(unsigned long *)val);  \
+       *(unsigned long *)val = mfspr(ADDRESS); \
 } \
-static unsigned long write_##NAME(unsigned long val) \
+static void write_##NAME(void *val) \
 { \
        ppc_enable_pmcs(); \
        mtspr(ADDRESS, *(unsigned long *)val);  \
-       return 0; \
 } \
 static ssize_t show_##NAME(struct sys_device *dev, \
                        struct sysdev_attribute *attr, \