111 lines
3.4 KiB
Diff
111 lines
3.4 KiB
Diff
From: Stefan Hajnoczi <stefanha@gmail.com>
|
|
Date: Thu, 22 Nov 2012 20:49:09 +0100
|
|
Subject: [090/106] staging: line6: drop variax volume sysfs attr
|
|
|
|
commit 9f242ef59b72be7f1c71233a5c91b6e2b3dbc6dc upstream.
|
|
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/line6/variax.c | 42 ----------------------------------------
|
|
drivers/staging/line6/variax.h | 5 -----
|
|
2 files changed, 47 deletions(-)
|
|
|
|
diff --git a/drivers/staging/line6/variax.c b/drivers/staging/line6/variax.c
|
|
index e76255b..ef78f5a 100644
|
|
--- a/drivers/staging/line6/variax.c
|
|
+++ b/drivers/staging/line6/variax.c
|
|
@@ -200,10 +200,6 @@ void line6_variax_process_message(struct usb_line6_variax *variax)
|
|
switch (buf[0]) {
|
|
case LINE6_PARAM_CHANGE | LINE6_CHANNEL_HOST:
|
|
switch (buf[1]) {
|
|
- case VARIAXMIDI_volume:
|
|
- variax->volume = buf[2];
|
|
- break;
|
|
-
|
|
case VARIAXMIDI_tone:
|
|
variax->tone = buf[2];
|
|
}
|
|
@@ -299,40 +295,6 @@ void line6_variax_process_message(struct usb_line6_variax *variax)
|
|
}
|
|
|
|
/*
|
|
- "read" request on "volume" special file.
|
|
-*/
|
|
-static ssize_t variax_get_volume(struct device *dev,
|
|
- struct device_attribute *attr, char *buf)
|
|
-{
|
|
- struct usb_line6_variax *variax =
|
|
- usb_get_intfdata(to_usb_interface(dev));
|
|
- return sprintf(buf, "%d\n", variax->volume);
|
|
-}
|
|
-
|
|
-/*
|
|
- "write" request on "volume" special file.
|
|
-*/
|
|
-static ssize_t variax_set_volume(struct device *dev,
|
|
- struct device_attribute *attr,
|
|
- const char *buf, size_t count)
|
|
-{
|
|
- struct usb_line6_variax *variax =
|
|
- usb_get_intfdata(to_usb_interface(dev));
|
|
- u8 value;
|
|
- int ret;
|
|
-
|
|
- ret = kstrtou8(buf, 10, &value);
|
|
- if (ret)
|
|
- return ret;
|
|
-
|
|
- if (line6_transmit_parameter(&variax->line6, VARIAXMIDI_volume,
|
|
- value) == 0)
|
|
- variax->volume = value;
|
|
-
|
|
- return count;
|
|
-}
|
|
-
|
|
-/*
|
|
"read" request on "active" special file.
|
|
*/
|
|
static ssize_t variax_get_active(struct device *dev,
|
|
@@ -515,8 +477,6 @@ static ssize_t variax_set_raw2(struct device *dev,
|
|
#endif
|
|
|
|
/* Variax workbench special files: */
|
|
-static DEVICE_ATTR(volume, S_IWUSR | S_IRUGO, variax_get_volume,
|
|
- variax_set_volume);
|
|
static DEVICE_ATTR(tone, S_IWUSR | S_IRUGO, variax_get_tone, variax_set_tone);
|
|
static DEVICE_ATTR(name, S_IRUGO, variax_get_name, line6_nop_write);
|
|
static DEVICE_ATTR(bank, S_IRUGO, variax_get_bank, line6_nop_write);
|
|
@@ -559,7 +519,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_volume));
|
|
CHECK_RETURN(device_create_file(dev, &dev_attr_tone));
|
|
CHECK_RETURN(device_create_file(dev, &dev_attr_name));
|
|
CHECK_RETURN(device_create_file(dev, &dev_attr_bank));
|
|
@@ -664,7 +623,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_volume);
|
|
device_remove_file(dev, &dev_attr_tone);
|
|
device_remove_file(dev, &dev_attr_name);
|
|
device_remove_file(dev, &dev_attr_bank);
|
|
diff --git a/drivers/staging/line6/variax.h b/drivers/staging/line6/variax.h
|
|
index 4151c14..426c90c 100644
|
|
--- a/drivers/staging/line6/variax.h
|
|
+++ b/drivers/staging/line6/variax.h
|
|
@@ -93,11 +93,6 @@ struct usb_line6_variax {
|
|
unsigned char bank[18];
|
|
|
|
/**
|
|
- Position of volume dial.
|
|
- */
|
|
- int volume;
|
|
-
|
|
- /**
|
|
Position of tone control dial.
|
|
*/
|
|
int tone;
|