From yani.ioannou@gmail.com Tue May 17 03:46:26 2005 Message-ID: <25381867050517034045502624@mail.gmail.com> Date: Tue, 17 May 2005 06:40:51 -0400 From: Yani Ioannou To: Greg KH Subject: Driver Core: arch: update device attribute callbacks Signed-off-by: Yani Ioannou Signed-off-by: Greg Kroah-Hartman --- arch/arm/common/amba.c | 2 +- arch/arm/kernel/ecard.c | 12 ++++++------ arch/arm26/kernel/ecard.c | 10 +++++----- arch/ia64/sn/kernel/tiocx.c | 4 ++-- arch/parisc/kernel/drivers.c | 2 +- arch/ppc/kernel/pci.c | 2 +- arch/ppc/syslib/ocp.c | 2 +- arch/ppc/syslib/of_device.c | 2 +- arch/ppc64/kernel/of_device.c | 2 +- arch/ppc64/kernel/pci.c | 2 +- arch/ppc64/kernel/vio.c | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) --- gregkh-2.6.orig/arch/arm/common/amba.c 2005-03-01 23:38:08.000000000 -0800 +++ gregkh-2.6/arch/arm/common/amba.c 2005-05-17 23:12:27.000000000 -0700 @@ -169,7 +169,7 @@ } #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); \ --- gregkh-2.6.orig/arch/arm/kernel/ecard.c 2005-05-09 09:06:53.000000000 -0700 +++ gregkh-2.6/arch/arm/kernel/ecard.c 2005-05-17 23:12:27.000000000 -0700 @@ -866,19 +866,19 @@ 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 @@ 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"); --- gregkh-2.6.orig/arch/arm26/kernel/ecard.c 2005-03-01 23:38:33.000000000 -0800 +++ gregkh-2.6/arch/arm26/kernel/ecard.c 2005-05-17 23:12:27.000000000 -0700 @@ -562,31 +562,31 @@ } } -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; --- gregkh-2.6.orig/arch/ia64/sn/kernel/tiocx.c 2005-05-17 22:48:39.000000000 -0700 +++ gregkh-2.6/arch/ia64/sn/kernel/tiocx.c 2005-05-17 23:12:27.000000000 -0700 @@ -432,7 +432,7 @@ 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 @@ 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; --- gregkh-2.6.orig/arch/parisc/kernel/drivers.c 2005-05-09 09:06:54.000000000 -0700 +++ gregkh-2.6/arch/parisc/kernel/drivers.c 2005-05-17 23:12:27.000000000 -0700 @@ -466,7 +466,7 @@ } #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); \ --- gregkh-2.6.orig/arch/ppc/kernel/pci.c 2005-05-17 23:03:57.000000000 -0700 +++ gregkh-2.6/arch/ppc/kernel/pci.c 2005-05-17 23:12:27.000000000 -0700 @@ -1003,7 +1003,7 @@ } } -static ssize_t pci_show_devspec(struct device *dev, char *buf) +static ssize_t pci_show_devspec(struct device *dev, struct device_attribute *attr, char *buf) { struct pci_dev *pdev; struct device_node *np; --- gregkh-2.6.orig/arch/ppc/syslib/ocp.c 2005-03-01 23:38:13.000000000 -0800 +++ gregkh-2.6/arch/ppc/syslib/ocp.c 2005-05-17 23:12:27.000000000 -0700 @@ -68,7 +68,7 @@ /* Sysfs support */ #define OCP_DEF_ATTR(field, format_string) \ static ssize_t \ -show_##field(struct device *dev, char *buf) \ +show_##field(struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct ocp_device *odev = to_ocp_dev(dev); \ \ --- gregkh-2.6.orig/arch/ppc/syslib/of_device.c 2005-03-01 23:38:33.000000000 -0800 +++ gregkh-2.6/arch/ppc/syslib/of_device.c 2005-05-17 23:12:27.000000000 -0700 @@ -161,7 +161,7 @@ } -static ssize_t dev_show_devspec(struct device *dev, char *buf) +static ssize_t dev_show_devspec(struct device *dev, struct device_attribute *attr, char *buf) { struct of_device *ofdev; --- gregkh-2.6.orig/arch/ppc64/kernel/of_device.c 2005-05-09 09:06:54.000000000 -0700 +++ gregkh-2.6/arch/ppc64/kernel/of_device.c 2005-05-17 23:12:27.000000000 -0700 @@ -161,7 +161,7 @@ } -static ssize_t dev_show_devspec(struct device *dev, char *buf) +static ssize_t dev_show_devspec(struct device *dev, struct device_attribute *attr, char *buf) { struct of_device *ofdev; --- gregkh-2.6.orig/arch/ppc64/kernel/pci.c 2005-05-17 23:03:57.000000000 -0700 +++ gregkh-2.6/arch/ppc64/kernel/pci.c 2005-05-17 23:12:27.000000000 -0700 @@ -507,7 +507,7 @@ } #ifdef CONFIG_PPC_MULTIPLATFORM -static ssize_t pci_show_devspec(struct device *dev, char *buf) +static ssize_t pci_show_devspec(struct device *dev, struct device_attribute *attr, char *buf) { struct pci_dev *pdev; struct device_node *np; --- gregkh-2.6.orig/arch/ppc64/kernel/vio.c 2005-05-09 09:06:54.000000000 -0700 +++ gregkh-2.6/arch/ppc64/kernel/vio.c 2005-05-17 23:12:27.000000000 -0700 @@ -300,7 +300,7 @@ } #ifdef CONFIG_PPC_PSERIES -static ssize_t viodev_show_devspec(struct device *dev, char *buf) +static ssize_t viodev_show_devspec(struct device *dev, struct device_attribute *attr, char *buf) { struct device_node *of_node = dev->platform_data; @@ -309,7 +309,7 @@ DEVICE_ATTR(devspec, S_IRUSR | S_IRGRP | S_IROTH, viodev_show_devspec, NULL); #endif -static ssize_t viodev_show_name(struct device *dev, char *buf) +static ssize_t viodev_show_name(struct device *dev, struct device_attribute *attr, char *buf) { return sprintf(buf, "%s\n", to_vio_dev(dev)->name); }