dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

staging: line6: change monitor_level type ValueWait -> int 

The monitor_level sysfs attr has been dropped and we never need to wait
on the monitor_level value to change.  Switch to a plain int and drop
the wait queue.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Stefan Hajnoczi 2012-11-22 20:48:47 +01:00 committed by Greg Kroah-Hartman
parent 410cefa7e9
commit 2c35dc2186
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/line6/pod.c
View File

@ -245,7 +245,7 @@ void line6_pod_process_message(struct usb_line6_pod *pod)
switch (buf[6]) {
case POD_monitor_level:
pod->monitor_level.value = value;
pod->monitor_level = value;
break;
PROCESS_SYSTEM_PARAM(routing);
@ -908,7 +908,7 @@ static int snd_pod_control_monitor_get(struct snd_kcontrol *kcontrol,
{
struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol);
struct usb_line6_pod *pod = (struct usb_line6_pod *)line6pcm->line6;
ucontrol->value.integer.value[0] = pod->monitor_level.value;
ucontrol->value.integer.value[0] = pod->monitor_level;
return 0;
}
@ -919,10 +919,10 @@ static int snd_pod_control_monitor_put(struct snd_kcontrol *kcontrol,
struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol);
struct usb_line6_pod *pod = (struct usb_line6_pod *)line6pcm->line6;
if (ucontrol->value.integer.value[0] == pod->monitor_level.value)
if (ucontrol->value.integer.value[0] == pod->monitor_level)
return 0;
pod->monitor_level.value = ucontrol->value.integer.value[0];
pod->monitor_level = ucontrol->value.integer.value[0];
pod_set_system_param_int(pod, ucontrol->value.integer.value[0],
POD_monitor_level);
return 1;
@ -1053,7 +1053,7 @@ static int pod_try_init(struct usb_interface *interface,
*/
if (pod->line6.properties->capabilities & LINE6_BIT_CONTROL) {
pod->monitor_level.value = POD_system_invalid;
pod->monitor_level = POD_system_invalid;
/* initiate startup procedure: */
pod_startup1(pod);

2
drivers/staging/line6/pod.h
View File

@ -121,7 +121,7 @@ struct usb_line6_pod {
/**
Instrument monitor level.
*/
struct ValueWait monitor_level;
int monitor_level;
/**
Audio routing mode.