Skip to content

L
linux-davinci-2.6.23
Commit ff381d22 authored by Yani Ioannou's avatar Yani Ioannou Committed by Greg Kroah-Hartman
Browse files
Options

[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
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
arch/arm/common/amba.c
View file @ ff381d22
...@@ -169,7 +169,7 @@ static void amba_device_release(struct device *dev) ...@@ -169,7 +169,7 @@ static void amba_device_release(struct device *dev)
} }
#define amba_attr(name,fmt,arg...) \ #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); \ struct amba_device *dev = to_amba_device(_dev); \
return sprintf(buf, fmt, arg); \ return sprintf(buf, fmt, arg); \
......
arch/arm/kernel/ecard.c
View file @ ff381d22
...@@ -866,19 +866,19 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot) ...@@ -866,19 +866,19 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
return ec; 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); struct expansion_card *ec = ECARD_DEV(dev);
return sprintf(buf, "%u\n", ec->irq); 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); struct expansion_card *ec = ECARD_DEV(dev);
return sprintf(buf, "%u\n", ec->dma); 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); struct expansion_card *ec = ECARD_DEV(dev);
char *str = buf; char *str = buf;
...@@ -893,19 +893,19 @@ static ssize_t ecard_show_resources(struct device *dev, char *buf) ...@@ -893,19 +893,19 @@ static ssize_t ecard_show_resources(struct device *dev, char *buf)
return str - 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); struct expansion_card *ec = ECARD_DEV(dev);
return sprintf(buf, "%u\n", ec->cid.manufacturer); 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); struct expansion_card *ec = ECARD_DEV(dev);
return sprintf(buf, "%u\n", ec->cid.product); 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); struct expansion_card *ec = ECARD_DEV(dev);
return sprintf(buf, "%s\n", ec->type == ECARD_EASI ? "EASI" : "IOC"); return sprintf(buf, "%s\n", ec->type == ECARD_EASI ? "EASI" : "IOC");
......
arch/arm26/kernel/ecard.c
View file @ ff381d22
...@@ -562,31 +562,31 @@ static void __init ecard_init_resources(struct expansion_card *ec) ...@@ -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); struct expansion_card *ec = ECARD_DEV(dev);
return sprintf(buf, "%u\n", ec->irq); 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); struct expansion_card *ec = ECARD_DEV(dev);
return sprintf(buf, "%u\n", ec->cid.manufacturer); 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); struct expansion_card *ec = ECARD_DEV(dev);
return sprintf(buf, "%u\n", ec->cid.product); 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); struct expansion_card *ec = ECARD_DEV(dev);
return sprintf(buf, "%u\n", ec->dma); 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); struct expansion_card *ec = ECARD_DEV(dev);
char *str = buf; char *str = buf;
......
arch/ia64/sn/kernel/tiocx.c
View file @ ff381d22
...@@ -432,7 +432,7 @@ static int tiocx_reload(struct cx_dev *cx_dev) ...@@ -432,7 +432,7 @@ static int tiocx_reload(struct cx_dev *cx_dev)
return cx_device_reload(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); struct cx_dev *cx_dev = to_cx_dev(dev);
...@@ -442,7 +442,7 @@ static ssize_t show_cxdev_control(struct device *dev, char *buf) ...@@ -442,7 +442,7 @@ static ssize_t show_cxdev_control(struct device *dev, char *buf)
tiocx_btchar_get(cx_dev->cx_id.nasid)); 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) size_t count)
{ {
int n; int n;
......
arch/parisc/kernel/drivers.c
View file @ ff381d22
...@@ -466,7 +466,7 @@ static int parisc_generic_match(struct device *dev, struct device_driver *drv) ...@@ -466,7 +466,7 @@ static int parisc_generic_match(struct device *dev, struct device_driver *drv)
} }
#define pa_dev_attr(name, field, format_string) \ #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); \ struct parisc_device *padev = to_parisc_device(dev); \
return sprintf(buf, format_string, padev->field); \ return sprintf(buf, format_string, padev->field); \
......
arch/ppc/kernel/pci.c
View file @ ff381d22
...@@ -1003,7 +1003,7 @@ pci_create_OF_bus_map(void) ...@@ -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 pci_dev *pdev;
struct device_node *np; struct device_node *np;
......
arch/ppc/syslib/ocp.c
View file @ ff381d22
...@@ -68,7 +68,7 @@ static int ocp_inited; ...@@ -68,7 +68,7 @@ static int ocp_inited;
/* Sysfs support */ /* Sysfs support */
#define OCP_DEF_ATTR(field, format_string) \ #define OCP_DEF_ATTR(field, format_string) \
static ssize_t \ 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); \ struct ocp_device *odev = to_ocp_dev(dev); \
\ \
......
arch/ppc/syslib/of_device.c
View file @ ff381d22
...@@ -161,7 +161,7 @@ void of_unregister_driver(struct of_platform_driver *drv) ...@@ -161,7 +161,7 @@ void of_unregister_driver(struct of_platform_driver *drv)
} }
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; struct of_device *ofdev;
......
arch/ppc64/kernel/of_device.c
View file @ ff381d22
...@@ -161,7 +161,7 @@ void of_unregister_driver(struct of_platform_driver *drv) ...@@ -161,7 +161,7 @@ void of_unregister_driver(struct of_platform_driver *drv)
} }
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; struct of_device *ofdev;
......
arch/ppc64/kernel/pci.c
View file @ ff381d22
...@@ -507,7 +507,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, ...@@ -507,7 +507,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
} }
#ifdef CONFIG_PPC_MULTIPLATFORM #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 pci_dev *pdev;
struct device_node *np; struct device_node *np;
......
arch/ppc64/kernel/vio.c
View file @ ff381d22
...@@ -300,7 +300,7 @@ static void __devinit vio_dev_release(struct device *dev) ...@@ -300,7 +300,7 @@ static void __devinit vio_dev_release(struct device *dev)
} }
#ifdef CONFIG_PPC_PSERIES #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; struct device_node *of_node = dev->platform_data;
...@@ -309,7 +309,7 @@ static ssize_t viodev_show_devspec(struct device *dev, char *buf) ...@@ -309,7 +309,7 @@ static ssize_t viodev_show_devspec(struct device *dev, char *buf)
DEVICE_ATTR(devspec, S_IRUSR | S_IRGRP | S_IROTH, viodev_show_devspec, NULL); DEVICE_ATTR(devspec, S_IRUSR | S_IRGRP | S_IROTH, viodev_show_devspec, NULL);
#endif #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); return sprintf(buf, "%s\n", to_vio_dev(dev)->name);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment