diff options
author | Dale Farnsworth <dale@farnsworth.org> | 2007-10-23 15:20:32 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-11-07 22:15:29 -0500 |
commit | d102c9d5d33f05c80fe91e95bd21c099e6d20260 (patch) | |
tree | 2b0c338451cfdfed2a3a9ddc596332e67ac12000 /arch/powerpc/sysdev/mv64x60_pci.c | |
parent | 3a800ff50a107b1b562f17e087a65e4c18e3a35c (diff) |
[POWERPC] Fix mv643xx_pci sysfs .read and .write functions
Commit 91a69029 introduced an additional parameter to the .read and .write
methods for sysfs binary attributes. Two mv64x60_pci functions
were missed in that patch, resulting in these errors:
/cache/git/linux-2.6/arch/powerpc/sysdev/mv64x60_pci.c:77: warning: initialization from incompatible pointer type
/cache/git/linux-2.6/arch/powerpc/sysdev/mv64x60_pci.c:78: warning: initialization from incompatible pointer type
Add the missing "struct bin_attribute *" parameter.
Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/sysdev/mv64x60_pci.c')
-rw-r--r-- | arch/powerpc/sysdev/mv64x60_pci.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/mv64x60_pci.c b/arch/powerpc/sysdev/mv64x60_pci.c index 9b3baa7317d7..6933f9c73b43 100644 --- a/arch/powerpc/sysdev/mv64x60_pci.c +++ b/arch/powerpc/sysdev/mv64x60_pci.c | |||
@@ -24,8 +24,9 @@ | |||
24 | #define MV64X60_VAL_LEN_MAX 11 | 24 | #define MV64X60_VAL_LEN_MAX 11 |
25 | #define MV64X60_PCICFG_CPCI_HOTSWAP 0x68 | 25 | #define MV64X60_PCICFG_CPCI_HOTSWAP 0x68 |
26 | 26 | ||
27 | static ssize_t mv64x60_hs_reg_read(struct kobject *kobj, char *buf, loff_t off, | 27 | static ssize_t mv64x60_hs_reg_read(struct kobject *kobj, |
28 | size_t count) | 28 | struct bin_attribute *attr, char *buf, |
29 | loff_t off, size_t count) | ||
29 | { | 30 | { |
30 | struct pci_dev *phb; | 31 | struct pci_dev *phb; |
31 | u32 v; | 32 | u32 v; |
@@ -44,8 +45,9 @@ static ssize_t mv64x60_hs_reg_read(struct kobject *kobj, char *buf, loff_t off, | |||
44 | return sprintf(buf, "0x%08x\n", v); | 45 | return sprintf(buf, "0x%08x\n", v); |
45 | } | 46 | } |
46 | 47 | ||
47 | static ssize_t mv64x60_hs_reg_write(struct kobject *kobj, char *buf, loff_t off, | 48 | static ssize_t mv64x60_hs_reg_write(struct kobject *kobj, |
48 | size_t count) | 49 | struct bin_attribute *attr, char *buf, |
50 | loff_t off, size_t count) | ||
49 | { | 51 | { |
50 | struct pci_dev *phb; | 52 | struct pci_dev *phb; |
51 | u32 v; | 53 | u32 v; |