Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338225
b: refs/heads/master
c: bd99f84
h: refs/heads/master
i:
  338223: 0efcf40
v: v3
  • Loading branch information
Stefan Hajnoczi authored and Greg Kroah-Hartman committed Nov 27, 2012
1 parent bb3d682 commit a483922
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 37 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c7b8ca5a596197f6b1069bf4164387f474873f00
refs/heads/master: bd99f84f484877ad87ee82adf2b3bbde4fdd9c2b
36 changes: 0 additions & 36 deletions trunk/drivers/staging/line6/pod.c
Original file line number Diff line number Diff line change
Expand Up @@ -370,38 +370,6 @@ static int pod_set_system_param_int(struct usb_line6_pod *pod, int value,
return 0;
}

/*
"read" request on "midi_postprocess" special file.
*/
static ssize_t pod_get_midi_postprocess(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct usb_interface *interface = to_usb_interface(dev);
struct usb_line6_pod *pod = usb_get_intfdata(interface);
return sprintf(buf, "%d\n", pod->midi_postprocess);
}

/*
"write" request on "midi_postprocess" special file.
*/
static ssize_t pod_set_midi_postprocess(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
struct usb_interface *interface = to_usb_interface(dev);
struct usb_line6_pod *pod = usb_get_intfdata(interface);
u8 value;
int ret;

ret = kstrtou8(buf, 10, &value);
if (ret)
return ret;

pod->midi_postprocess = value ? 1 : 0;
return count;
}

/*
"read" request on "serial_number" special file.
*/
Expand Down Expand Up @@ -510,8 +478,6 @@ static void pod_startup5(struct work_struct *work)
static DEVICE_ATTR(device_id, S_IRUGO, pod_get_device_id, line6_nop_write);
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(serial_number, S_IRUGO, pod_get_serial_number,
line6_nop_write);

Expand Down Expand Up @@ -594,7 +560,6 @@ static int pod_create_files2(struct device *dev)

CHECK_RETURN(device_create_file(dev, &dev_attr_device_id));
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_serial_number));

#ifdef CONFIG_LINE6_USB_RAW
Expand Down Expand Up @@ -708,7 +673,6 @@ void line6_pod_disconnect(struct usb_interface *interface)

device_remove_file(dev, &dev_attr_device_id);
device_remove_file(dev, &dev_attr_firmware_version);
device_remove_file(dev, &dev_attr_midi_postprocess);
device_remove_file(dev, &dev_attr_serial_number);

#ifdef CONFIG_LINE6_USB_RAW
Expand Down

0 comments on commit a483922

Please sign in to comment.