Signed-off-by: Yani Ioannou <[email protected]>
---
arm/common/amba.c | 2 +-
arm/kernel/ecard.c | 12 ++++++------
arm26/kernel/ecard.c | 10 +++++-----
ia64/sn/kernel/tiocx.c | 4 ++--
parisc/kernel/drivers.c | 2 +-
ppc/kernel/pci.c | 2 +-
ppc/syslib/ocp.c | 2 +-
ppc/syslib/of_device.c | 2 +-
ppc64/kernel/of_device.c | 2 +-
ppc64/kernel/pci.c | 2 +-
ppc64/kernel/vio.c | 4 ++--
11 files changed, 22 insertions(+), 22 deletions(-)
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/arm/common/amba.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/arm/common/amba.c
--- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/arm/common/amba.c 2005-05-16 20:35:06.000000000 -0400
+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/arm/common/amba.c 2005-05-16 23:45:52.000000000 -0400
@@ -169,7 +169,7 @@ static void amba_device_release(struct d
}
#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); \
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/arm/kernel/ecard.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/arm/kernel/ecard.c
--- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/arm/kernel/ecard.c 2005-05-16 20:35:06.000000000 -0400
+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/arm/kernel/ecard.c 2005-05-16 23:45:52.000000000 -0400
@@ -866,19 +866,19 @@ static struct expansion_card *__init eca
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(stru
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");
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/arm26/kernel/ecard.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/arm26/kernel/ecard.c
--- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/arm26/kernel/ecard.c 2005-05-16 20:35:21.000000000 -0400
+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/arm26/kernel/ecard.c 2005-05-16 23:45:52.000000000 -0400
@@ -562,31 +562,31 @@ static void __init ecard_init_resources(
}
}
-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;
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ia64/sn/kernel/tiocx.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ia64/sn/kernel/tiocx.c
--- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ia64/sn/kernel/tiocx.c 2005-05-16 20:35:15.000000000 -0400
+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ia64/sn/kernel/tiocx.c 2005-05-16 23:45:52.000000000 -0400
@@ -432,7 +432,7 @@ static int tiocx_reload(struct cx_dev *c
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
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;
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/parisc/kernel/drivers.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/parisc/kernel/drivers.c
--- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/parisc/kernel/drivers.c 2005-05-16 20:35:25.000000000 -0400
+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/parisc/kernel/drivers.c 2005-05-16 23:45:52.000000000 -0400
@@ -466,7 +466,7 @@ static int parisc_generic_match(struct d
}
#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); \
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ppc/kernel/pci.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ppc/kernel/pci.c
--- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ppc/kernel/pci.c 2005-05-16 20:35:10.000000000 -0400
+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ppc/kernel/pci.c 2005-05-16 23:45:52.000000000 -0400
@@ -1003,7 +1003,7 @@ pci_create_OF_bus_map(void)
}
}
-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;
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ppc/syslib/ocp.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ppc/syslib/ocp.c
--- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ppc/syslib/ocp.c 2005-05-16 20:35:10.000000000 -0400
+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ppc/syslib/ocp.c 2005-05-16 23:45:52.000000000 -0400
@@ -68,7 +68,7 @@ static int ocp_inited;
/* 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); \
\
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ppc/syslib/of_device.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ppc/syslib/of_device.c
--- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ppc/syslib/of_device.c 2005-05-16 20:35:10.000000000 -0400
+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ppc/syslib/of_device.c 2005-05-16 23:45:52.000000000 -0400
@@ -161,7 +161,7 @@ void of_unregister_driver(struct of_plat
}
-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;
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ppc64/kernel/of_device.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ppc64/kernel/of_device.c
--- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ppc64/kernel/of_device.c 2005-05-16 20:35:22.000000000 -0400
+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ppc64/kernel/of_device.c 2005-05-16 23:45:52.000000000 -0400
@@ -161,7 +161,7 @@ void of_unregister_driver(struct of_plat
}
-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;
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ppc64/kernel/pci.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ppc64/kernel/pci.c
--- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ppc64/kernel/pci.c 2005-05-16 20:35:22.000000000 -0400
+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ppc64/kernel/pci.c 2005-05-16 23:45:52.000000000 -0400
@@ -507,7 +507,7 @@ int pci_mmap_page_range(struct pci_dev *
}
#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;
diff -uprN -X dontdiff linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ppc64/kernel/vio.c linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ppc64/kernel/vio.c
--- linux-2.6.12-rc4-sysfsdyncallback-deviceattr/arch/ppc64/kernel/vio.c 2005-05-16 20:35:22.000000000 -0400
+++ linux-2.6.12-rc4-sysfsdyncallback-deviceattr-update/arch/ppc64/kernel/vio.c 2005-05-16 23:45:52.000000000 -0400
@@ -300,7 +300,7 @@ static void __devinit vio_dev_release(st
}
#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 @@ static ssize_t viodev_show_devspec(struc
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);
}
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
