diff options
| author | Stefan Hajnoczi <stefanha@gmail.com> | 2012-11-22 20:48:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 16:11:12 -0800 |
| commit | 410cefa7e9990373d2f46d6ea2c95f1bad284b04 (patch) | |
| tree | a081ed89112a986575b9f1c392d15309397c6834 /drivers/staging | |
| parent | 4fe520dc27d4912913e9ce1cd76d4e9a1c73b93c (diff) | |
staging: line6: drop monitor_level sysfs attr
The monitor level can be adjusted using an ALSA volume control.
Therefore the sysfs attribute is unnecessary. Note that we leave the
monitor_level driver variable so that the ALSA volume control still
works.
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/line6/pod.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/staging/line6/pod.c b/drivers/staging/line6/pod.c index c1eb1456dfdb..5a941fa9f7a6 100644 --- a/drivers/staging/line6/pod.c +++ b/drivers/staging/line6/pod.c @@ -244,8 +244,10 @@ void line6_pod_process_message(struct usb_line6_pod *pod) break; switch (buf[6]) { - PROCESS_SYSTEM_PARAM - (monitor_level); + case POD_monitor_level: + pod->monitor_level.value = value; + break; + PROCESS_SYSTEM_PARAM(routing); PROCESS_SYSTEM_PARAM (tuner_mute); @@ -844,7 +846,6 @@ static ssize_t pod_set_ ## code(struct device *dev, \ return pod_set_system_param_string(pod, buf, count, POD_ ## code, mask); \ } -POD_GET_SET_SYSTEM_PARAM(monitor_level, 0xffff, 0); POD_GET_SET_SYSTEM_PARAM(routing, 0x0003, 0); POD_GET_SET_SYSTEM_PARAM(tuner_mute, 0x0001, 0); POD_GET_SET_SYSTEM_PARAM(tuner_freq, 0xffff, 0); @@ -861,8 +862,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(monitor_level, S_IWUSR | S_IRUGO, pod_get_monitor_level, - pod_set_monitor_level); 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, @@ -969,7 +968,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_monitor_level)); 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)); @@ -1008,7 +1006,6 @@ static int pod_try_init(struct usb_interface *interface, return -ENODEV; /* initialize wait queues: */ - init_waitqueue_head(&pod->monitor_level.wait); init_waitqueue_head(&pod->routing.wait); init_waitqueue_head(&pod->tuner_mute.wait); init_waitqueue_head(&pod->tuner_freq.wait); @@ -1106,7 +1103,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_monitor_level); device_remove_file(dev, &dev_attr_name); device_remove_file(dev, &dev_attr_name_buf); device_remove_file(dev, &dev_attr_retrieve_amp_setup); |