Commit f3c5261e authored by Jerry Snitselaar's avatar Jerry Snitselaar Committed by Greg Kroah-Hartman

staging/line6: blank line after declaration cleanup

Fix coding style warnings reported by checkpath.
Signed-off-by: default avatarJerry Snitselaar <dev@snitselaar.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 62ca89a1
...@@ -97,6 +97,7 @@ void line6_unlink_audio_in_urbs(struct snd_line6_pcm *line6pcm) ...@@ -97,6 +97,7 @@ void line6_unlink_audio_in_urbs(struct snd_line6_pcm *line6pcm)
if (test_bit(i, &line6pcm->active_urb_in)) { if (test_bit(i, &line6pcm->active_urb_in)) {
if (!test_and_set_bit(i, &line6pcm->unlink_urb_in)) { if (!test_and_set_bit(i, &line6pcm->unlink_urb_in)) {
struct urb *u = line6pcm->urb_audio_in[i]; struct urb *u = line6pcm->urb_audio_in[i];
usb_unlink_urb(u); usb_unlink_urb(u);
} }
} }
...@@ -334,6 +335,7 @@ static int snd_line6_capture_hw_params(struct snd_pcm_substream *substream, ...@@ -334,6 +335,7 @@ static int snd_line6_capture_hw_params(struct snd_pcm_substream *substream,
static int snd_line6_capture_hw_free(struct snd_pcm_substream *substream) static int snd_line6_capture_hw_free(struct snd_pcm_substream *substream)
{ {
struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
line6_pcm_release(line6pcm, LINE6_BIT_PCM_ALSA_CAPTURE_BUFFER); line6_pcm_release(line6pcm, LINE6_BIT_PCM_ALSA_CAPTURE_BUFFER);
return snd_pcm_lib_free_pages(substream); return snd_pcm_lib_free_pages(substream);
} }
...@@ -380,6 +382,7 @@ static snd_pcm_uframes_t ...@@ -380,6 +382,7 @@ static snd_pcm_uframes_t
snd_line6_capture_pointer(struct snd_pcm_substream *substream) snd_line6_capture_pointer(struct snd_pcm_substream *substream)
{ {
struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
return line6pcm->pos_in_done; return line6pcm->pos_in_done;
} }
......
...@@ -183,6 +183,7 @@ static void line6_midi_output_drain(struct snd_rawmidi_substream *substream) ...@@ -183,6 +183,7 @@ static void line6_midi_output_drain(struct snd_rawmidi_substream *substream)
struct usb_line6 *line6 = struct usb_line6 *line6 =
line6_rawmidi_substream_midi(substream)->line6; line6_rawmidi_substream_midi(substream)->line6;
struct snd_line6_midi *midi = line6->line6midi; struct snd_line6_midi *midi = line6->line6midi;
wait_event_interruptible(midi->send_wait, wait_event_interruptible(midi->send_wait,
midi->num_active_send_urbs == 0); midi->num_active_send_urbs == 0);
} }
...@@ -260,6 +261,7 @@ static int snd_line6_new_midi(struct snd_line6_midi *line6midi) ...@@ -260,6 +261,7 @@ static int snd_line6_new_midi(struct snd_line6_midi *line6midi)
static int snd_line6_midi_free(struct snd_device *device) static int snd_line6_midi_free(struct snd_device *device)
{ {
struct snd_line6_midi *line6midi = device->device_data; struct snd_line6_midi *line6midi = device->device_data;
line6_midibuf_destroy(&line6midi->midibuf_in); line6_midibuf_destroy(&line6midi->midibuf_in);
line6_midibuf_destroy(&line6midi->midibuf_out); line6_midibuf_destroy(&line6midi->midibuf_out);
return 0; return 0;
......
...@@ -44,6 +44,7 @@ static void change_volume(struct urb *urb_out, int volume[], ...@@ -44,6 +44,7 @@ static void change_volume(struct urb *urb_out, int volume[],
} }
} else if (bytes_per_frame == 6) { } else if (bytes_per_frame == 6) {
unsigned char *p, *buf_end; unsigned char *p, *buf_end;
p = (unsigned char *)urb_out->transfer_buffer; p = (unsigned char *)urb_out->transfer_buffer;
buf_end = p + urb_out->transfer_buffer_length; buf_end = p + urb_out->transfer_buffer_length;
...@@ -310,6 +311,7 @@ void line6_unlink_audio_out_urbs(struct snd_line6_pcm *line6pcm) ...@@ -310,6 +311,7 @@ void line6_unlink_audio_out_urbs(struct snd_line6_pcm *line6pcm)
if (test_bit(i, &line6pcm->active_urb_out)) { if (test_bit(i, &line6pcm->active_urb_out)) {
if (!test_and_set_bit(i, &line6pcm->unlink_urb_out)) { if (!test_and_set_bit(i, &line6pcm->unlink_urb_out)) {
struct urb *u = line6pcm->urb_audio_out[i]; struct urb *u = line6pcm->urb_audio_out[i];
usb_unlink_urb(u); usb_unlink_urb(u);
} }
} }
...@@ -363,7 +365,6 @@ static void audio_out_callback(struct urb *urb) ...@@ -363,7 +365,6 @@ static void audio_out_callback(struct urb *urb)
{ {
int i, index, length = 0, shutdown = 0; int i, index, length = 0, shutdown = 0;
unsigned long flags; unsigned long flags;
struct snd_line6_pcm *line6pcm = (struct snd_line6_pcm *)urb->context; struct snd_line6_pcm *line6pcm = (struct snd_line6_pcm *)urb->context;
struct snd_pcm_substream *substream = struct snd_pcm_substream *substream =
get_substream(line6pcm, SNDRV_PCM_STREAM_PLAYBACK); get_substream(line6pcm, SNDRV_PCM_STREAM_PLAYBACK);
...@@ -389,6 +390,7 @@ static void audio_out_callback(struct urb *urb) ...@@ -389,6 +390,7 @@ static void audio_out_callback(struct urb *urb)
if (test_bit(LINE6_INDEX_PCM_ALSA_PLAYBACK_STREAM, &line6pcm->flags)) { if (test_bit(LINE6_INDEX_PCM_ALSA_PLAYBACK_STREAM, &line6pcm->flags)) {
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
line6pcm->pos_out_done += line6pcm->pos_out_done +=
length / line6pcm->properties->bytes_per_frame; length / line6pcm->properties->bytes_per_frame;
...@@ -485,6 +487,7 @@ static int snd_line6_playback_hw_params(struct snd_pcm_substream *substream, ...@@ -485,6 +487,7 @@ static int snd_line6_playback_hw_params(struct snd_pcm_substream *substream,
static int snd_line6_playback_hw_free(struct snd_pcm_substream *substream) static int snd_line6_playback_hw_free(struct snd_pcm_substream *substream)
{ {
struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
line6_pcm_release(line6pcm, LINE6_BIT_PCM_ALSA_PLAYBACK_BUFFER); line6_pcm_release(line6pcm, LINE6_BIT_PCM_ALSA_PLAYBACK_BUFFER);
return snd_pcm_lib_free_pages(substream); return snd_pcm_lib_free_pages(substream);
} }
...@@ -539,6 +542,7 @@ static snd_pcm_uframes_t ...@@ -539,6 +542,7 @@ static snd_pcm_uframes_t
snd_line6_playback_pointer(struct snd_pcm_substream *substream) snd_line6_playback_pointer(struct snd_pcm_substream *substream)
{ {
struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream); struct snd_line6_pcm *line6pcm = snd_pcm_substream_chip(substream);
return line6pcm->pos_out_done; return line6pcm->pos_out_done;
} }
......
...@@ -197,6 +197,7 @@ static ssize_t serial_number_show(struct device *dev, ...@@ -197,6 +197,7 @@ static ssize_t serial_number_show(struct device *dev,
{ {
struct usb_interface *interface = to_usb_interface(dev); struct usb_interface *interface = to_usb_interface(dev);
struct usb_line6_pod *pod = usb_get_intfdata(interface); struct usb_line6_pod *pod = usb_get_intfdata(interface);
return sprintf(buf, "%d\n", pod->serial_number); return sprintf(buf, "%d\n", pod->serial_number);
} }
...@@ -208,6 +209,7 @@ static ssize_t firmware_version_show(struct device *dev, ...@@ -208,6 +209,7 @@ static ssize_t firmware_version_show(struct device *dev,
{ {
struct usb_interface *interface = to_usb_interface(dev); struct usb_interface *interface = to_usb_interface(dev);
struct usb_line6_pod *pod = usb_get_intfdata(interface); struct usb_line6_pod *pod = usb_get_intfdata(interface);
return sprintf(buf, "%d.%02d\n", pod->firmware_version / 100, return sprintf(buf, "%d.%02d\n", pod->firmware_version / 100,
pod->firmware_version % 100); pod->firmware_version % 100);
} }
...@@ -220,6 +222,7 @@ static ssize_t device_id_show(struct device *dev, ...@@ -220,6 +222,7 @@ static ssize_t device_id_show(struct device *dev,
{ {
struct usb_interface *interface = to_usb_interface(dev); struct usb_interface *interface = to_usb_interface(dev);
struct usb_line6_pod *pod = usb_get_intfdata(interface); struct usb_line6_pod *pod = usb_get_intfdata(interface);
return sprintf(buf, "%d\n", pod->device_id); return sprintf(buf, "%d\n", pod->device_id);
} }
...@@ -243,6 +246,7 @@ static void pod_startup2(unsigned long data) ...@@ -243,6 +246,7 @@ static void pod_startup2(unsigned long data)
{ {
struct usb_line6_pod *pod = (struct usb_line6_pod *)data; struct usb_line6_pod *pod = (struct usb_line6_pod *)data;
struct usb_line6 *line6 = &pod->line6; struct usb_line6 *line6 = &pod->line6;
CHECK_STARTUP_PROGRESS(pod->startup_progress, POD_STARTUP_VERSIONREQ); CHECK_STARTUP_PROGRESS(pod->startup_progress, POD_STARTUP_VERSIONREQ);
/* request firmware version: */ /* request firmware version: */
...@@ -294,6 +298,7 @@ static int snd_pod_control_monitor_get(struct snd_kcontrol *kcontrol, ...@@ -294,6 +298,7 @@ static int snd_pod_control_monitor_get(struct snd_kcontrol *kcontrol,
{ {
struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol); struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol);
struct usb_line6_pod *pod = (struct usb_line6_pod *)line6pcm->line6; struct usb_line6_pod *pod = (struct usb_line6_pod *)line6pcm->line6;
ucontrol->value.integer.value[0] = pod->monitor_level; ucontrol->value.integer.value[0] = pod->monitor_level;
return 0; return 0;
} }
......
...@@ -185,6 +185,7 @@ static int snd_toneport_monitor_get(struct snd_kcontrol *kcontrol, ...@@ -185,6 +185,7 @@ static int snd_toneport_monitor_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol); struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol);
ucontrol->value.integer.value[0] = line6pcm->volume_monitor; ucontrol->value.integer.value[0] = line6pcm->volume_monitor;
return 0; return 0;
} }
...@@ -263,6 +264,7 @@ static void toneport_start_pcm(unsigned long arg) ...@@ -263,6 +264,7 @@ static void toneport_start_pcm(unsigned long arg)
{ {
struct usb_line6_toneport *toneport = (struct usb_line6_toneport *)arg; struct usb_line6_toneport *toneport = (struct usb_line6_toneport *)arg;
struct usb_line6 *line6 = &toneport->line6; struct usb_line6 *line6 = &toneport->line6;
line6_pcm_acquire(line6->line6pcm, LINE6_BITS_PCM_MONITOR); line6_pcm_acquire(line6->line6pcm, LINE6_BITS_PCM_MONITOR);
} }
......
...@@ -95,6 +95,7 @@ static void variax_startup3(struct usb_line6_variax *variax) ...@@ -95,6 +95,7 @@ static void variax_startup3(struct usb_line6_variax *variax)
static void variax_startup4(unsigned long data) static void variax_startup4(unsigned long data)
{ {
struct usb_line6_variax *variax = (struct usb_line6_variax *)data; struct usb_line6_variax *variax = (struct usb_line6_variax *)data;
CHECK_STARTUP_PROGRESS(variax->startup_progress, CHECK_STARTUP_PROGRESS(variax->startup_progress,
VARIAX_STARTUP_ACTIVATE); VARIAX_STARTUP_ACTIVATE);
...@@ -107,6 +108,7 @@ static void variax_startup4(unsigned long data) ...@@ -107,6 +108,7 @@ static void variax_startup4(unsigned long data)
static void variax_startup5(unsigned long data) static void variax_startup5(unsigned long data)
{ {
struct usb_line6_variax *variax = (struct usb_line6_variax *)data; struct usb_line6_variax *variax = (struct usb_line6_variax *)data;
CHECK_STARTUP_PROGRESS(variax->startup_progress, CHECK_STARTUP_PROGRESS(variax->startup_progress,
VARIAX_STARTUP_WORKQUEUE); VARIAX_STARTUP_WORKQUEUE);
......
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