Commit 28079044 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Greg Kroah-Hartman

staging: line6: drop MIDI parameter sysfs attrs

Both pod.c and variax.c expose the device's MIDI parameters as sysfs
attrs.  Knowledge of MIDI constants should be in userspace, not in the
driver.  Drop the sysfs attrs and let userspace interpret parameters it
cares about instead.
Signed-off-by: default avatarStefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4528555c
...@@ -3,7 +3,6 @@ obj-$(CONFIG_LINE6_USB) += line6usb.o ...@@ -3,7 +3,6 @@ obj-$(CONFIG_LINE6_USB) += line6usb.o
line6usb-y := \ line6usb-y := \
audio.o \ audio.o \
capture.o \ capture.o \
control.o \
driver.o \ driver.o \
dumprequest.o \ dumprequest.o \
midi.o \ midi.o \
......
This diff is collapsed.
This diff is collapsed.
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "audio.h" #include "audio.h"
#include "capture.h" #include "capture.h"
#include "control.h"
#include "driver.h" #include "driver.h"
#include "midi.h" #include "midi.h"
#include "playback.h" #include "playback.h"
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "audio.h" #include "audio.h"
#include "capture.h" #include "capture.h"
#include "control.h"
#include "driver.h" #include "driver.h"
#include "playback.h" #include "playback.h"
#include "pod.h" #include "pod.h"
...@@ -404,10 +403,6 @@ static void pod_startup5(struct work_struct *work) ...@@ -404,10 +403,6 @@ static void pod_startup5(struct work_struct *work)
/* ALSA audio interface: */ /* ALSA audio interface: */
line6_register_audio(line6); line6_register_audio(line6);
/* device files: */
line6_pod_create_files(pod->firmware_version,
line6->properties->device_bit, line6->ifcdev);
} }
/* POD special files: */ /* POD special files: */
...@@ -594,10 +589,6 @@ void line6_pod_disconnect(struct usb_interface *interface) ...@@ -594,10 +589,6 @@ void line6_pod_disconnect(struct usb_interface *interface)
if (dev != NULL) { if (dev != NULL) {
/* remove sysfs entries: */ /* remove sysfs entries: */
line6_pod_remove_files(pod->firmware_version,
pod->line6.
properties->device_bit, dev);
device_remove_file(dev, &dev_attr_device_id); device_remove_file(dev, &dev_attr_device_id);
device_remove_file(dev, &dev_attr_firmware_version); device_remove_file(dev, &dev_attr_firmware_version);
device_remove_file(dev, &dev_attr_serial_number); device_remove_file(dev, &dev_attr_serial_number);
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include "audio.h" #include "audio.h"
#include "control.h"
#include "driver.h" #include "driver.h"
#include "variax.h" #include "variax.h"
...@@ -174,15 +173,11 @@ static void variax_startup7(struct work_struct *work) ...@@ -174,15 +173,11 @@ static void variax_startup7(struct work_struct *work)
{ {
struct usb_line6_variax *variax = struct usb_line6_variax *variax =
container_of(work, struct usb_line6_variax, startup_work); container_of(work, struct usb_line6_variax, startup_work);
struct usb_line6 *line6 = &variax->line6;
CHECK_STARTUP_PROGRESS(variax->startup_progress, VARIAX_STARTUP_SETUP); CHECK_STARTUP_PROGRESS(variax->startup_progress, VARIAX_STARTUP_SETUP);
/* ALSA audio interface: */ /* ALSA audio interface: */
line6_register_audio(&variax->line6); line6_register_audio(&variax->line6);
/* device files: */
line6_variax_create_files(0, 0, line6->ifcdev);
} }
/* /*
...@@ -370,16 +365,8 @@ int line6_variax_init(struct usb_interface *interface, ...@@ -370,16 +365,8 @@ int line6_variax_init(struct usb_interface *interface,
*/ */
void line6_variax_disconnect(struct usb_interface *interface) void line6_variax_disconnect(struct usb_interface *interface)
{ {
struct device *dev;
if (interface == NULL) if (interface == NULL)
return; return;
dev = &interface->dev;
if (dev != NULL) {
/* remove sysfs entries: */
line6_variax_remove_files(0, 0, dev);
}
variax_destruct(interface); variax_destruct(interface);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment