staging: line6: drop retrieve_effects_setup sysfs attr
authorStefan Hajnoczi <stefanha@gmail.com>
Thu, 22 Nov 2012 19:48:52 +0000 (20:48 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Nov 2012 00:11:13 +0000 (16:11 -0800)
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/line6/pod.c

index bc65fc7a71491df98efc0638675b58927e35d6d5..95769c58a94d46c7bcd01be5b80373f7be811e49 100644 (file)
@@ -380,39 +380,6 @@ static int pod_resolve(const char *buf, short block0, short block1,
        return 0;
 }
 
-/*
-       Send command to store channel/effects setup/amp setup to PODxt Pro.
-*/
-static ssize_t pod_send_store_command(struct device *dev, const char *buf,
-                                     size_t count, short block0, short block1)
-{
-       struct usb_interface *interface = to_usb_interface(dev);
-       struct usb_line6_pod *pod = usb_get_intfdata(interface);
-       int ret;
-       int size = 3 + sizeof(pod->prog_data_buf);
-       char *sysex = pod_alloc_sysex_buffer(pod, POD_SYSEX_STORE, size);
-
-       if (!sysex)
-               return 0;
-
-       /* Don't know what this is good for, but PODxt Pro transmits it, so we
-        * also do... */
-       sysex[SYSEX_DATA_OFS] = 5;
-       ret = pod_resolve(buf, block0, block1, sysex + SYSEX_DATA_OFS + 1);
-       if (ret) {
-               kfree(sysex);
-               return ret;
-       }
-
-       memcpy(sysex + SYSEX_DATA_OFS + 3, &pod->prog_data_buf,
-              sizeof(pod->prog_data_buf));
-
-       line6_send_sysex_message(&pod->line6, sysex, size);
-       kfree(sysex);
-       /* needs some delay here on AMD64 platform */
-       return count;
-}
-
 /*
        Send command to retrieve channel/effects setup/amp setup to PODxt Pro.
 */
@@ -607,16 +574,6 @@ static ssize_t pod_set_store_amp_setup(struct device *dev,
        return pod_send_store_command(dev, buf, count, 0x0040, 0x0100);
 }
 
-/*
-       "write" request on "retrieve_effects_setup" special file.
-*/
-static ssize_t pod_set_retrieve_effects_setup(struct device *dev,
-                                             struct device_attribute *attr,
-                                             const char *buf, size_t count)
-{
-       return pod_send_retrieve_command(dev, buf, count, 0x0080, 0x0080);
-}
-
 /*
        "read" request on "midi_postprocess" special file.
 */
@@ -790,8 +747,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(retrieve_effects_setup, S_IWUSR, line6_nop_read,
-                  pod_set_retrieve_effects_setup);
 static DEVICE_ATTR(routing, S_IWUSR | S_IRUGO, pod_get_routing,
                   pod_set_routing);
 static DEVICE_ATTR(serial_number, S_IRUGO, pod_get_serial_number,
@@ -890,7 +845,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_retrieve_effects_setup));
        CHECK_RETURN(device_create_file(dev, &dev_attr_routing));
        CHECK_RETURN(device_create_file(dev, &dev_attr_serial_number));
        CHECK_RETURN(device_create_file(dev, &dev_attr_store_amp_setup));
@@ -1021,8 +975,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_retrieve_effects_setup);
                        device_remove_file(dev, &dev_attr_routing);
                        device_remove_file(dev, &dev_attr_serial_number);
                        device_remove_file(dev, &dev_attr_store_amp_setup);