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

Commit ff381d22 authored by Yani Ioannou's avatar Yani Ioannou Committed by Greg Kroah-Hartman
Browse files

[PATCH] Driver Core: arch: update device attribute callbacks 



Signed-off-by: default avatarYani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3eb8c783

arch/arm/common/amba.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static void amba_device_release(struct device *dev) 
}



#define amba_attr(name,fmt,arg...)				\

static ssize_t show_##name(struct device *_dev, char *buf)	\

static ssize_t show_##name(struct device *_dev, struct device_attribute *attr, char *buf)	\

{								\

	struct amba_device *dev = to_amba_device(_dev);		\

	return sprintf(buf, fmt, arg);				\

arch/arm/kernel/ecard.c

+6 −6
Original line number Diff line number Diff line
@@ -866,19 +866,19 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot) 
	return ec;

}



static ssize_t ecard_show_irq(struct device *dev, char *buf)

static ssize_t ecard_show_irq(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct expansion_card *ec = ECARD_DEV(dev);

	return sprintf(buf, "%u\n", ec->irq);

}



static ssize_t ecard_show_dma(struct device *dev, char *buf)

static ssize_t ecard_show_dma(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct expansion_card *ec = ECARD_DEV(dev);

	return sprintf(buf, "%u\n", ec->dma);

}



static ssize_t ecard_show_resources(struct device *dev, char *buf)

static ssize_t ecard_show_resources(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct expansion_card *ec = ECARD_DEV(dev);

	char *str = buf;
@@ -893,19 +893,19 @@ static ssize_t ecard_show_resources(struct device *dev, char *buf) 
	return str - buf;

}



static ssize_t ecard_show_vendor(struct device *dev, char *buf)

static ssize_t ecard_show_vendor(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct expansion_card *ec = ECARD_DEV(dev);

	return sprintf(buf, "%u\n", ec->cid.manufacturer);

}



static ssize_t ecard_show_device(struct device *dev, char *buf)

static ssize_t ecard_show_device(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct expansion_card *ec = ECARD_DEV(dev);

	return sprintf(buf, "%u\n", ec->cid.product);

}



static ssize_t ecard_show_type(struct device *dev, char *buf)

static ssize_t ecard_show_type(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct expansion_card *ec = ECARD_DEV(dev);

	return sprintf(buf, "%s\n", ec->type == ECARD_EASI ? "EASI" : "IOC");

arch/arm26/kernel/ecard.c

+5 −5
Original line number Diff line number Diff line
@@ -562,31 +562,31 @@ static void __init ecard_init_resources(struct expansion_card *ec) 
	}

}



static ssize_t ecard_show_irq(struct device *dev, char *buf)

static ssize_t ecard_show_irq(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct expansion_card *ec = ECARD_DEV(dev);

	return sprintf(buf, "%u\n", ec->irq);

}



static ssize_t ecard_show_vendor(struct device *dev, char *buf)

static ssize_t ecard_show_vendor(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct expansion_card *ec = ECARD_DEV(dev);

	return sprintf(buf, "%u\n", ec->cid.manufacturer);

}



static ssize_t ecard_show_device(struct device *dev, char *buf)

static ssize_t ecard_show_device(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct expansion_card *ec = ECARD_DEV(dev);

	return sprintf(buf, "%u\n", ec->cid.product);

}



static ssize_t ecard_show_dma(struct device *dev, char *buf)

static ssize_t ecard_show_dma(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct expansion_card *ec = ECARD_DEV(dev);

	return sprintf(buf, "%u\n", ec->dma);

}



static ssize_t ecard_show_resources(struct device *dev, char *buf)

static ssize_t ecard_show_resources(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct expansion_card *ec = ECARD_DEV(dev);

	char *str = buf;

arch/ia64/sn/kernel/tiocx.c

+2 −2
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static int tiocx_reload(struct cx_dev *cx_dev) 
	return cx_device_reload(cx_dev);

}



static ssize_t show_cxdev_control(struct device *dev, char *buf)

static ssize_t show_cxdev_control(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct cx_dev *cx_dev = to_cx_dev(dev);
@@ -442,7 +442,7 @@ static ssize_t show_cxdev_control(struct device *dev, char *buf) 
		       tiocx_btchar_get(cx_dev->cx_id.nasid));

}



static ssize_t store_cxdev_control(struct device *dev, const char *buf,

static ssize_t store_cxdev_control(struct device *dev, struct device_attribute *attr, const char *buf,

				   size_t count)

{

	int n;

arch/parisc/kernel/drivers.c

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static int parisc_generic_match(struct device *dev, struct device_driver *drv) 
}



#define pa_dev_attr(name, field, format_string)				\

static ssize_t name##_show(struct device *dev, char *buf)		\

static ssize_t name##_show(struct device *dev, struct device_attribute *attr, char *buf)		\

{									\

	struct parisc_device *padev = to_parisc_device(dev);		\

	return sprintf(buf, format_string, padev->field);		\