From fa7c2d7cfce6ad4bf666f6af6dd23f528e37cf35 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Thu, 22 Nov 2012 20:48:48 +0100 Subject: [PATCH] --- yaml --- r: 338211 b: refs/heads/master c: 3eac723b4b30a7a85777ea84453ff7f8866331cf h: refs/heads/master i: 338209: 36b9f4313cc86d99005a7ac71af70defa03846ad 338207: 6c313488b9958dadd41cc8e5910fafa48e615ff2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/line6/pod.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/[refs] b/[refs] index f5e03a9cf20e..7e39e488a458 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c35dc2186ba0acbff57846c19cfedee87efd272 +refs/heads/master: 3eac723b4b30a7a85777ea84453ff7f8866331cf diff --git a/trunk/drivers/staging/line6/pod.c b/trunk/drivers/staging/line6/pod.c index 165c7ad6bcce..76525c55376c 100644 --- a/trunk/drivers/staging/line6/pod.c +++ b/trunk/drivers/staging/line6/pod.c @@ -473,18 +473,6 @@ static ssize_t get_name_generic(struct usb_line6_pod *pod, const char *str, return last_non_space - buf + 2; } -/* - "read" request on "name" special file. -*/ -static ssize_t pod_get_name(struct device *dev, struct device_attribute *attr, - char *buf) -{ - struct usb_interface *interface = to_usb_interface(dev); - struct usb_line6_pod *pod = usb_get_intfdata(interface); - return get_name_generic(pod, pod->prog_data.header + POD_NAME_OFFSET, - buf); -} - /* "read" request on "name" special file. */ @@ -862,7 +850,6 @@ static DEVICE_ATTR(firmware_version, S_IRUGO, pod_get_firmware_version, line6_nop_write); static DEVICE_ATTR(midi_postprocess, S_IWUSR | S_IRUGO, pod_get_midi_postprocess, pod_set_midi_postprocess); -static DEVICE_ATTR(name, S_IRUGO, pod_get_name, line6_nop_write); static DEVICE_ATTR(name_buf, S_IRUGO, pod_get_name_buf, line6_nop_write); static DEVICE_ATTR(retrieve_amp_setup, S_IWUSR, line6_nop_read, pod_set_retrieve_amp_setup); @@ -968,7 +955,6 @@ static int pod_create_files2(struct device *dev) CHECK_RETURN(device_create_file(dev, &dev_attr_finish)); CHECK_RETURN(device_create_file(dev, &dev_attr_firmware_version)); CHECK_RETURN(device_create_file(dev, &dev_attr_midi_postprocess)); - CHECK_RETURN(device_create_file(dev, &dev_attr_name)); CHECK_RETURN(device_create_file(dev, &dev_attr_name_buf)); CHECK_RETURN(device_create_file(dev, &dev_attr_retrieve_amp_setup)); CHECK_RETURN(device_create_file(dev, &dev_attr_retrieve_channel)); @@ -1103,7 +1089,6 @@ void line6_pod_disconnect(struct usb_interface *interface) device_remove_file(dev, &dev_attr_finish); device_remove_file(dev, &dev_attr_firmware_version); device_remove_file(dev, &dev_attr_midi_postprocess); - device_remove_file(dev, &dev_attr_name); device_remove_file(dev, &dev_attr_name_buf); device_remove_file(dev, &dev_attr_retrieve_amp_setup); device_remove_file(dev, &dev_attr_retrieve_channel);