[PATCH] Driver Core: drivers/usb/input/aiptek.c - drivers/zorro/zorro-sysfs.c: update device attribute callbacks

Signed-off-by: Yani Ioannou <yani.ioannou@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

4 files changed, 21 insertions, 21 deletions

diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c
index 626e2b05f719..b33044d56a1e 100644
--- a/drivers/usb/misc/cytherm.c
+++ b/drivers/usb/misc/cytherm.c
@@ -85,7 +85,7 @@ static int vendor_command(struct usb_device *dev, unsigned char request,
 #define BRIGHTNESS 0x2c     /* RAM location for brightness value */
 #define BRIGHTNESS_SEM 0x2b /* RAM location for brightness semaphore */
 
-static ssize_t show_brightness(struct device *dev, char *buf)
+static ssize_t show_brightness(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_interface *intf = to_usb_interface(dev);    
         struct usb_cytherm *cytherm = usb_get_intfdata(intf);     
@@ -93,7 +93,7 @@ static ssize_t show_brightness(struct device *dev, char *buf)
         return sprintf(buf, "%i", cytherm->brightness);
 }
 
-static ssize_t set_brightness(struct device *dev, const char *buf, 
+static ssize_t set_brightness(struct device *dev, struct device_attribute *attr, const char *buf,
                               size_t count)
 {
         struct usb_interface *intf = to_usb_interface(dev);
@@ -138,7 +138,7 @@ static DEVICE_ATTR(brightness, S_IRUGO | S_IWUSR | S_IWGRP,
 #define TEMP 0x33 /* RAM location for temperature */
 #define SIGN 0x34 /* RAM location for temperature sign */
 
-static ssize_t show_temp(struct device *dev, char *buf)
+static ssize_t show_temp(struct device *dev, struct device_attribute *attr, char *buf)
 {
 
         struct usb_interface *intf = to_usb_interface(dev);
@@ -174,7 +174,7 @@ static ssize_t show_temp(struct device *dev, char *buf)
 }
 
 
-static ssize_t set_temp(struct device *dev, const char *buf, size_t count)
+static ssize_t set_temp(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         return count;
 }
@@ -184,7 +184,7 @@ static DEVICE_ATTR(temp, S_IRUGO, show_temp, set_temp);
 
 #define BUTTON 0x7a
 
-static ssize_t show_button(struct device *dev, char *buf)
+static ssize_t show_button(struct device *dev, struct device_attribute *attr, char *buf)
 {
 
         struct usb_interface *intf = to_usb_interface(dev);
@@ -215,7 +215,7 @@ static ssize_t show_button(struct device *dev, char *buf)
 }
 
 
-static ssize_t set_button(struct device *dev, const char *buf, size_t count)
+static ssize_t set_button(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         return count;
 }
@@ -223,7 +223,7 @@ static ssize_t set_button(struct device *dev, const char *buf, size_t count)
 static DEVICE_ATTR(button, S_IRUGO, show_button, set_button);
 
 
-static ssize_t show_port0(struct device *dev, char *buf)
+static ssize_t show_port0(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct usb_cytherm *cytherm = usb_get_intfdata(intf);
@@ -249,7 +249,7 @@ static ssize_t show_port0(struct device *dev, char *buf)
 }
 
 
-static ssize_t set_port0(struct device *dev, const char *buf, size_t count)
+static ssize_t set_port0(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct usb_cytherm *cytherm = usb_get_intfdata(intf);
@@ -283,7 +283,7 @@ static ssize_t set_port0(struct device *dev, const char *buf, size_t count)
 
 static DEVICE_ATTR(port0, S_IRUGO | S_IWUSR | S_IWGRP, show_port0, set_port0);
 
-static ssize_t show_port1(struct device *dev, char *buf)
+static ssize_t show_port1(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct usb_cytherm *cytherm = usb_get_intfdata(intf);
@@ -309,7 +309,7 @@ static ssize_t show_port1(struct device *dev, char *buf)
 }
 
 
-static ssize_t set_port1(struct device *dev, const char *buf, size_t count)
+static ssize_t set_port1(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct usb_cytherm *cytherm = usb_get_intfdata(intf);
diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c
index ddbf8e992368..067a81486921 100644
--- a/drivers/usb/misc/phidgetkit.c
+++ b/drivers/usb/misc/phidgetkit.c
@@ -173,7 +173,7 @@ exit:
 }
 
 #define set_lcd_line(number)    \
-static ssize_t lcd_line_##number(struct device *dev, const char *buf, size_t count)     \
+static ssize_t lcd_line_##number(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)      \
 {                                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);                             \
         struct phidget_interfacekit *kit = usb_get_intfdata(intf);                      \
@@ -184,7 +184,7 @@ static DEVICE_ATTR(lcd_line_##number, S_IWUGO, NULL, lcd_line_##number);
 set_lcd_line(1);
 set_lcd_line(2);
 
-static ssize_t set_backlight(struct device *dev, const char *buf, size_t count)
+static ssize_t set_backlight(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct phidget_interfacekit *kit = usb_get_intfdata(intf);
@@ -232,7 +232,7 @@ static void remove_lcd_files(struct phidget_interfacekit *kit)
         }
 }
 
-static ssize_t enable_lcd_files(struct device *dev, const char *buf, size_t count)
+static ssize_t enable_lcd_files(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
         struct usb_interface *intf = to_usb_interface(dev);
         struct phidget_interfacekit *kit = usb_get_intfdata(intf);
@@ -307,7 +307,7 @@ resubmit:
 }
 
 #define show_set_output(value)          \
-static ssize_t set_output##value(struct device *dev, const char *buf,   \
+static ssize_t set_output##value(struct device *dev, struct device_attribute *attr, const char *buf,    \
                                                         size_t count)   \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
@@ -324,7 +324,7 @@ static ssize_t set_output##value(struct device *dev, const char *buf, 	\
         return retval ? retval : count;                                 \
 }                                                                       \
                                                                         \
-static ssize_t show_output##value(struct device *dev, char *buf)        \
+static ssize_t show_output##value(struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
         struct phidget_interfacekit *kit = usb_get_intfdata(intf);      \
@@ -343,7 +343,7 @@ show_set_output(7);
 show_set_output(8);     /* should be MAX_INTERFACES - 1 */
 
 #define show_input(value)       \
-static ssize_t show_input##value(struct device *dev, char *buf) \
+static ssize_t show_input##value(struct device *dev, struct device_attribute *attr, char *buf)  \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
         struct phidget_interfacekit *kit = usb_get_intfdata(intf);      \
@@ -362,7 +362,7 @@ show_input(7);
 show_input(8);          /* should be MAX_INTERFACES - 1 */
 
 #define show_sensor(value)      \
-static ssize_t show_sensor##value(struct device *dev, char *buf)        \
+static ssize_t show_sensor##value(struct device *dev, struct device_attribute *attr, char *buf) \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
         struct phidget_interfacekit *kit = usb_get_intfdata(intf);      \
diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c
index 4bd291502a3c..b84eda631ab5 100644
--- a/drivers/usb/misc/phidgetservo.c
+++ b/drivers/usb/misc/phidgetservo.c
@@ -207,7 +207,7 @@ change_position_v20(struct phidget_servo *servo, int servo_no, int degrees,
 }
 
 #define show_set(value) \
-static ssize_t set_servo##value (struct device *dev,                    \
+static ssize_t set_servo##value (struct device *dev, struct device_attribute *attr,                     \
                                         const char *buf, size_t count)  \
 {                                                                       \
         int degrees, minutes, retval;                                   \
@@ -233,7 +233,7 @@ static ssize_t set_servo##value (struct device *dev,			\
         return retval < 0 ? retval : count;                             \
 }                                                                       \
                                                                         \
-static ssize_t show_servo##value (struct device *dev, char *buf)        \
+static ssize_t show_servo##value (struct device *dev, struct device_attribute *attr, char *buf)         \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface (dev);            \
         struct phidget_servo *servo = usb_get_intfdata (intf);          \
diff --git a/drivers/usb/misc/usbled.c b/drivers/usb/misc/usbled.c
index ee329d5e1c5e..f6ba4c788dbc 100644
--- a/drivers/usb/misc/usbled.c
+++ b/drivers/usb/misc/usbled.c
@@ -81,14 +81,14 @@ static void change_color(struct usb_led *led)
 }
 
 #define show_set(value) \
-static ssize_t show_##value(struct device *dev, char *buf)              \
+static ssize_t show_##value(struct device *dev, struct device_attribute *attr, char *buf)               \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
         struct usb_led *led = usb_get_intfdata(intf);                   \
                                                                         \
         return sprintf(buf, "%d\n", led->value);                        \
 }                                                                       \
-static ssize_t set_##value(struct device *dev, const char *buf, size_t count)   \
+static ssize_t set_##value(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)    \
 {                                                                       \
         struct usb_interface *intf = to_usb_interface(dev);             \
         struct usb_led *led = usb_get_intfdata(intf);                   \