From f4b4218eac975701de1fa921d6c1a478861509c0 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Thu, 22 Nov 2012 20:48:53 +0100 Subject: [PATCH] --- yaml --- r: 338216 b: refs/heads/master c: 4c41d9210eb851b7c28c3af21c5069e68ec14497 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/line6/pod.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 4bfee3555c68..bdf961411ccd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7404419c903087b9c9c73c69888c9af2b9d0f733 +refs/heads/master: 4c41d9210eb851b7c28c3af21c5069e68ec14497 diff --git a/trunk/drivers/staging/line6/pod.c b/trunk/drivers/staging/line6/pod.c index 95769c58a94d..deafee909720 100644 --- a/trunk/drivers/staging/line6/pod.c +++ b/trunk/drivers/staging/line6/pod.c @@ -564,16 +564,6 @@ static ssize_t pod_set_store_effects_setup(struct device *dev, return pod_send_store_command(dev, buf, count, 0x0080, 0x0080); } -/* - "write" request on "store_amp_setup" special file. -*/ -static ssize_t pod_set_store_amp_setup(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) -{ - return pod_send_store_command(dev, buf, count, 0x0040, 0x0100); -} - /* "read" request on "midi_postprocess" special file. */ @@ -751,8 +741,6 @@ static DEVICE_ATTR(routing, S_IWUSR | S_IRUGO, pod_get_routing, pod_set_routing); static DEVICE_ATTR(serial_number, S_IRUGO, pod_get_serial_number, line6_nop_write); -static DEVICE_ATTR(store_amp_setup, S_IWUSR, line6_nop_read, - pod_set_store_amp_setup); static DEVICE_ATTR(store_channel, S_IWUSR, line6_nop_read, pod_set_store_channel); static DEVICE_ATTR(store_effects_setup, S_IWUSR, line6_nop_read, @@ -847,7 +835,6 @@ static int pod_create_files2(struct device *dev) CHECK_RETURN(device_create_file(dev, &dev_attr_midi_postprocess)); CHECK_RETURN(device_create_file(dev, &dev_attr_routing)); CHECK_RETURN(device_create_file(dev, &dev_attr_serial_number)); - CHECK_RETURN(device_create_file(dev, &dev_attr_store_amp_setup)); CHECK_RETURN(device_create_file(dev, &dev_attr_store_channel)); CHECK_RETURN(device_create_file(dev, &dev_attr_store_effects_setup)); CHECK_RETURN(device_create_file(dev, &dev_attr_tuner_freq)); @@ -977,7 +964,6 @@ void line6_pod_disconnect(struct usb_interface *interface) device_remove_file(dev, &dev_attr_midi_postprocess); device_remove_file(dev, &dev_attr_routing); device_remove_file(dev, &dev_attr_serial_number); - device_remove_file(dev, &dev_attr_store_amp_setup); device_remove_file(dev, &dev_attr_store_channel); device_remove_file(dev, &dev_attr_store_effects_setup); device_remove_file(dev, &dev_attr_tuner_freq);