staging: line6: drop variax name sysfs attr

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/line6/variax.c b/drivers/staging/line6/variax.c
index 31ece3476866c3977bc1d050f688454c2aaa8e06..94a9f7190e96bd8b40946c2926080e60bf210293 100644 (file)
--- a/drivers/staging/line6/variax.c
+++ b/drivers/staging/line6/variax.c
@@ -218,17 +218,6 @@ void line6_variax_process_message(struct usb_line6_variax *variax)
                            VARIAX_MODEL_MESSAGE_LENGTH) {
                                switch (variax->dumpreq.in_progress) {
                                case VARIAX_DUMP_PASS1:
-                                       variax_decode(buf +
-                                                     VARIAX_MODEL_HEADER_LENGTH,
-                                                     (unsigned char *)
-                                                     &variax->model_data,
-                                                     (sizeof
-                                                      (variax->model_data.
-                                                       name) +
-                                                      sizeof(variax->
-                                                             model_data.
-                                                             control)
-                                                      / 2) * 2);
                                        line6_dump_request_async
                                            (&variax->dumpreq, &variax->line6,
                                             1, VARIAX_DUMP_PASS2);
@@ -337,19 +326,6 @@ static ssize_t get_string(char *buf, const char *data, int length)
        return i + 2;
 }
 
-/*
-       "read" request on "name" special file.
-*/
-static ssize_t variax_get_name(struct device *dev,
-                              struct device_attribute *attr, char *buf)
-{
-       struct usb_line6_variax *variax =
-           usb_get_intfdata(to_usb_interface(dev));
-       line6_dump_wait_interruptible(&variax->dumpreq);
-       return get_string(buf, variax->model_data.name,
-                         sizeof(variax->model_data.name));
-}
-
 /*
        "read" request on "bank" special file.
 */
@@ -438,7 +414,6 @@ static ssize_t variax_set_raw2(struct device *dev,
 #endif
 
 /* Variax workbench special files: */
-static DEVICE_ATTR(name, S_IRUGO, variax_get_name, line6_nop_write);
 static DEVICE_ATTR(bank, S_IRUGO, variax_get_bank, line6_nop_write);
 static DEVICE_ATTR(dump, S_IRUGO, variax_get_dump, line6_nop_write);
 static DEVICE_ATTR(active, S_IWUSR | S_IRUGO, variax_get_active,
@@ -479,7 +454,6 @@ static void variax_destruct(struct usb_interface *interface)
 static int variax_create_files2(struct device *dev)
 {
        int err;
-       CHECK_RETURN(device_create_file(dev, &dev_attr_name));
        CHECK_RETURN(device_create_file(dev, &dev_attr_bank));
        CHECK_RETURN(device_create_file(dev, &dev_attr_dump));
        CHECK_RETURN(device_create_file(dev, &dev_attr_active));
@@ -582,7 +556,6 @@ void line6_variax_disconnect(struct usb_interface *interface)
        if (dev != NULL) {
                /* remove sysfs entries: */
                line6_variax_remove_files(0, 0, dev);
-               device_remove_file(dev, &dev_attr_name);
                device_remove_file(dev, &dev_attr_bank);
                device_remove_file(dev, &dev_attr_dump);
                device_remove_file(dev, &dev_attr_active);