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

staging: line6: drop dirty sysfs attr

Signed-off-by: default avatarStefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9c29cf51
...@@ -156,12 +156,11 @@ static void pod_dump(struct usb_line6_pod *pod, const unsigned char *data) ...@@ -156,12 +156,11 @@ static void pod_dump(struct usb_line6_pod *pod, const unsigned char *data)
} }
/* /*
Store parameter value in driver memory and mark it as dirty. Store parameter value in driver memory.
*/ */
static void pod_store_parameter(struct usb_line6_pod *pod, int param, int value) static void pod_store_parameter(struct usb_line6_pod *pod, int param, int value)
{ {
pod->prog_data.control[param] = value; pod->prog_data.control[param] = value;
pod->dirty = 1;
} }
/* /*
...@@ -170,7 +169,6 @@ static void pod_store_parameter(struct usb_line6_pod *pod, int param, int value) ...@@ -170,7 +169,6 @@ static void pod_store_parameter(struct usb_line6_pod *pod, int param, int value)
static void pod_save_button_pressed(struct usb_line6_pod *pod, int type, static void pod_save_button_pressed(struct usb_line6_pod *pod, int type,
int index) int index)
{ {
pod->dirty = 0;
set_bit(POD_SAVE_PRESSED, &pod->atomic_flags); set_bit(POD_SAVE_PRESSED, &pod->atomic_flags);
} }
...@@ -209,7 +207,6 @@ void line6_pod_process_message(struct usb_line6_pod *pod) ...@@ -209,7 +207,6 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
case LINE6_PROGRAM_CHANGE | LINE6_CHANNEL_DEVICE: case LINE6_PROGRAM_CHANGE | LINE6_CHANNEL_DEVICE:
case LINE6_PROGRAM_CHANGE | LINE6_CHANNEL_HOST: case LINE6_PROGRAM_CHANGE | LINE6_CHANNEL_HOST:
pod->dirty = 0;
set_bit(POD_CHANNEL_DIRTY, &pod->atomic_flags); set_bit(POD_CHANNEL_DIRTY, &pod->atomic_flags);
line6_dump_request_async(&pod->dumpreq, &pod->line6, 0, line6_dump_request_async(&pod->dumpreq, &pod->line6, 0,
LINE6_DUMP_CURRENT); LINE6_DUMP_CURRENT);
...@@ -777,19 +774,6 @@ static ssize_t pod_set_retrieve_amp_setup(struct device *dev, ...@@ -777,19 +774,6 @@ static ssize_t pod_set_retrieve_amp_setup(struct device *dev,
return pod_send_retrieve_command(dev, buf, count, 0x0040, 0x0100); return pod_send_retrieve_command(dev, buf, count, 0x0040, 0x0100);
} }
/*
"read" request on "dirty" special file.
*/
static ssize_t pod_get_dirty(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);
buf[0] = pod->dirty ? '1' : '0';
buf[1] = '\n';
return 2;
}
/* /*
"read" request on "midi_postprocess" special file. "read" request on "midi_postprocess" special file.
*/ */
...@@ -959,7 +943,6 @@ POD_GET_SYSTEM_PARAM(tuner_pitch, 1); ...@@ -959,7 +943,6 @@ POD_GET_SYSTEM_PARAM(tuner_pitch, 1);
/* POD special files: */ /* POD special files: */
static DEVICE_ATTR(device_id, S_IRUGO, pod_get_device_id, line6_nop_write); static DEVICE_ATTR(device_id, S_IRUGO, pod_get_device_id, line6_nop_write);
static DEVICE_ATTR(dirty, S_IRUGO, pod_get_dirty, line6_nop_write);
static DEVICE_ATTR(dump, S_IWUSR | S_IRUGO, pod_get_dump, pod_set_dump); static DEVICE_ATTR(dump, S_IWUSR | S_IRUGO, pod_get_dump, pod_set_dump);
static DEVICE_ATTR(dump_buf, S_IWUSR | S_IRUGO, pod_get_dump_buf, static DEVICE_ATTR(dump_buf, S_IWUSR | S_IRUGO, pod_get_dump_buf,
pod_set_dump_buf); pod_set_dump_buf);
...@@ -1073,7 +1056,6 @@ static int pod_create_files2(struct device *dev) ...@@ -1073,7 +1056,6 @@ static int pod_create_files2(struct device *dev)
int err; int err;
CHECK_RETURN(device_create_file(dev, &dev_attr_device_id)); CHECK_RETURN(device_create_file(dev, &dev_attr_device_id));
CHECK_RETURN(device_create_file(dev, &dev_attr_dirty));
CHECK_RETURN(device_create_file(dev, &dev_attr_dump)); CHECK_RETURN(device_create_file(dev, &dev_attr_dump));
CHECK_RETURN(device_create_file(dev, &dev_attr_dump_buf)); CHECK_RETURN(device_create_file(dev, &dev_attr_dump_buf));
CHECK_RETURN(device_create_file(dev, &dev_attr_finish)); CHECK_RETURN(device_create_file(dev, &dev_attr_finish));
...@@ -1213,7 +1195,6 @@ void line6_pod_disconnect(struct usb_interface *interface) ...@@ -1213,7 +1195,6 @@ void line6_pod_disconnect(struct usb_interface *interface)
properties->device_bit, dev); 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_dirty);
device_remove_file(dev, &dev_attr_dump); device_remove_file(dev, &dev_attr_dump);
device_remove_file(dev, &dev_attr_dump_buf); device_remove_file(dev, &dev_attr_dump_buf);
device_remove_file(dev, &dev_attr_finish); device_remove_file(dev, &dev_attr_finish);
......
...@@ -167,11 +167,6 @@ struct usb_line6_pod { ...@@ -167,11 +167,6 @@ struct usb_line6_pod {
*/ */
int device_id; int device_id;
/**
Flag to indicate modification of current program settings.
*/
char dirty;
/** /**
Flag to enable MIDI postprocessing. Flag to enable MIDI postprocessing.
*/ */
......
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