aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/line6/driver.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-02-27 20:25:43 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:54:25 -0700
commit77491e524ccb78adfad9cdc1b0b175c4e9fd0368 (patch)
tree476119fd653107d78f2c5a546529aa3093b902fe /drivers/staging/line6/driver.c
parentStaging: line6: depends on SND (diff)
downloadlinux-dev-77491e524ccb78adfad9cdc1b0b175c4e9fd0368.tar.xz
linux-dev-77491e524ccb78adfad9cdc1b0b175c4e9fd0368.zip
Staging: line6: remove DEVICE_ATTRIBUTE
As the code is in the kernel tree, it's no longer needed. Cc: Markus Grabner <grabner@icg.tugraz.at> Cc: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/line6/driver.c')
-rw-r--r--drivers/staging/line6/driver.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index f20efa583691..a5a1c07e6a01 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -556,7 +556,8 @@ int line6_read_serial_number(struct usb_line6 *line6, int *serial_number)
/*
No operation (i.e., unsupported).
*/
-ssize_t line6_nop_read(struct device *dev, DEVICE_ATTRIBUTE char *buf)
+ssize_t line6_nop_read(struct device *dev, struct device_attribute *attr,
+ char *buf)
{
return 0;
}
@@ -564,7 +565,8 @@ ssize_t line6_nop_read(struct device *dev, DEVICE_ATTRIBUTE char *buf)
/*
No operation (i.e., unsupported).
*/
-ssize_t line6_nop_write(struct device *dev, DEVICE_ATTRIBUTE const char *buf, size_t count)
+ssize_t line6_nop_write(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
{
return count;
}
@@ -573,7 +575,8 @@ ssize_t line6_nop_write(struct device *dev, DEVICE_ATTRIBUTE const char *buf, si
"write" request on "raw" special file.
*/
#if CREATE_RAW_FILE
-ssize_t line6_set_raw(struct device *dev, DEVICE_ATTRIBUTE const char *buf, size_t count)
+ssize_t line6_set_raw(struct device *dev, struct device_attribute *attr,
+ const char *buf, size_t count)
{
struct usb_interface *interface = to_usb_interface(dev);
struct usb_line6 *line6 = usb_get_intfdata(interface);