Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d102c9d5d33f05c80fe91e95bd21c099e6d20260
Commit:     d102c9d5d33f05c80fe91e95bd21c099e6d20260
Parent:     3a800ff50a107b1b562f17e087a65e4c18e3a35c
Author:     Dale Farnsworth <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 24 05:20:32 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Thu Nov 8 14:15:29 2007 +1100

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 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 9b3baa7..6933f9c 100644
--- a/arch/powerpc/sysdev/mv64x60_pci.c
+++ b/arch/powerpc/sysdev/mv64x60_pci.c
@@ -24,8 +24,9 @@
 #define MV64X60_VAL_LEN_MAX            11
 #define MV64X60_PCICFG_CPCI_HOTSWAP    0x68
 
-static ssize_t mv64x60_hs_reg_read(struct kobject *kobj, char *buf, loff_t off,
-                                  size_t count)
+static ssize_t mv64x60_hs_reg_read(struct kobject *kobj,
+                                  struct bin_attribute *attr, char *buf,
+                                  loff_t off, size_t count)
 {
        struct pci_dev *phb;
        u32 v;
@@ -44,8 +45,9 @@ static ssize_t mv64x60_hs_reg_read(struct kobject *kobj, char 
*buf, loff_t off,
        return sprintf(buf, "0x%08x\n", v);
 }
 
-static ssize_t mv64x60_hs_reg_write(struct kobject *kobj, char *buf, loff_t 
off,
-                                   size_t count)
+static ssize_t mv64x60_hs_reg_write(struct kobject *kobj,
+                                   struct bin_attribute *attr, char *buf,
+                                   loff_t off, size_t count)
 {
        struct pci_dev *phb;
        u32 v;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to