Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d102c9d5 authored by Dale Farnsworth's avatar Dale Farnsworth Committed by Paul Mackerras
Browse files

[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: default avatarDale Farnsworth <dale@farnsworth.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3a800ff5

arch/powerpc/sysdev/mv64x60_pci.c

+6 −4
Original line number Diff line number Diff line
@@ -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;