diff options
author | Yani Ioannou <yani.ioannou@gmail.com> | 2005-05-17 06:42:58 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-20 18:15:34 -0400 |
commit | e404e274f62665f3333d6a539d0d3701f678a598 (patch) | |
tree | ef6618291524edaab45c4123274730c7d57ae852 /drivers/pcmcia | |
parent | a5099cfc2e82240b0a3e72ad79a5969d5af1a7dc (diff) |
[PATCH] Driver Core: drivers/i2c/chips/w83781d.c - drivers/s390/block/dcssblk.c: update device attribute callbacks
Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/ds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index c4ade288c5da..569e55feecfd 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
@@ -604,14 +604,14 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) { | |||
604 | /************************ per-device sysfs output ***************************/ | 604 | /************************ per-device sysfs output ***************************/ |
605 | 605 | ||
606 | #define pcmcia_device_attr(field, test, format) \ | 606 | #define pcmcia_device_attr(field, test, format) \ |
607 | static ssize_t field##_show (struct device *dev, char *buf) \ | 607 | static ssize_t field##_show (struct device *dev, struct device_attribute *attr, char *buf) \ |
608 | { \ | 608 | { \ |
609 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \ | 609 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \ |
610 | return p_dev->test ? sprintf (buf, format, p_dev->field) : -ENODEV; \ | 610 | return p_dev->test ? sprintf (buf, format, p_dev->field) : -ENODEV; \ |
611 | } | 611 | } |
612 | 612 | ||
613 | #define pcmcia_device_stringattr(name, field) \ | 613 | #define pcmcia_device_stringattr(name, field) \ |
614 | static ssize_t name##_show (struct device *dev, char *buf) \ | 614 | static ssize_t name##_show (struct device *dev, struct device_attribute *attr, char *buf) \ |
615 | { \ | 615 | { \ |
616 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \ | 616 | struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \ |
617 | return p_dev->field ? sprintf (buf, "%s\n", p_dev->field) : -ENODEV; \ | 617 | return p_dev->field ? sprintf (buf, "%s\n", p_dev->field) : -ENODEV; \ |