public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@gmail.com>
To: devel@driverdev.osuosl.org
Cc: Markus Grabner <grabner@icg.tugraz.at>,
	Daniel Mack <zonque@gmail.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	line6linux-devel@lists.sourceforge.net,
	<linux-kernel@vger.kernel.org>,
	Stefan Hajnoczi <stefanha@gmail.com>
Subject: [PATCH 5/8] staging: line6: wrap lines to 80 chars in playback.c
Date: Sun, 11 Nov 2012 13:24:43 +0100	[thread overview]
Message-ID: <1352636686-31170-6-git-send-email-stefanha@gmail.com> (raw)
In-Reply-To: <1352636686-31170-1-git-send-email-stefanha@gmail.com>

There are a few instances of 80+ character lines in playback.c.  Two
instances are just because of a useless comment "this is somewhat
paranoid", so drop the comment.  Other instances are straightforward
line wrapping.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
---
 drivers/staging/line6/playback.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c
index a0ab9d0..4cf23af 100644
--- a/drivers/staging/line6/playback.c
+++ b/drivers/staging/line6/playback.c
@@ -185,7 +185,7 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
 	if (urb_size == 0) {
 		/* can't determine URB size */
 		spin_unlock_irqrestore(&line6pcm->lock_audio_out, flags);
-		dev_err(line6pcm->line6->ifcdev, "driver bug: urb_size = 0\n");	/* this is somewhat paranoid */
+		dev_err(line6pcm->line6->ifcdev, "driver bug: urb_size = 0\n");
 		return -EINVAL;
 	}
 
@@ -218,7 +218,8 @@ static int submit_audio_out_urb(struct snd_line6_pcm *line6pcm)
 				       len * bytes_per_frame, runtime->dma_area,
 				       (urb_frames - len) * bytes_per_frame);
 			} else
-				dev_err(line6pcm->line6->ifcdev, "driver bug: len = %d\n", len);	/* this is somewhat paranoid */
+				dev_err(line6pcm->line6->ifcdev, "driver bug: len = %d\n",
+					len);
 		} else {
 			memcpy(urb_out->transfer_buffer,
 			       runtime->dma_area +
@@ -319,7 +320,8 @@ void line6_unlink_audio_out_urbs(struct snd_line6_pcm *line6pcm)
 }
 
 /*
-	Wait until unlinking of all currently active playback URBs has been finished.
+	Wait until unlinking of all currently active playback URBs has been
+	finished.
 */
 void line6_wait_clear_audio_out_urbs(struct snd_line6_pcm *line6pcm)
 {
@@ -413,7 +415,8 @@ static void audio_out_callback(struct urb *urb)
 	if (!shutdown) {
 		submit_audio_out_urb(line6pcm);
 
-		if (test_bit(LINE6_INDEX_PCM_ALSA_PLAYBACK_STREAM, &line6pcm->flags)) {
+		if (test_bit(LINE6_INDEX_PCM_ALSA_PLAYBACK_STREAM,
+			     &line6pcm->flags)) {
 			line6pcm->bytes_out += length;
 			if (line6pcm->bytes_out >= line6pcm->period_out) {
 				line6pcm->bytes_out %= line6pcm->period_out;
@@ -499,7 +502,8 @@ int snd_line6_playback_trigger(struct snd_line6_pcm *line6pcm, int cmd)
 #ifdef CONFIG_PM
 	case SNDRV_PCM_TRIGGER_RESUME:
 #endif
-		err = line6_pcm_acquire(line6pcm, LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM);
+		err = line6_pcm_acquire(line6pcm,
+					LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM);
 
 		if (err < 0)
 			return err;
@@ -510,7 +514,8 @@ int snd_line6_playback_trigger(struct snd_line6_pcm *line6pcm, int cmd)
 #ifdef CONFIG_PM
 	case SNDRV_PCM_TRIGGER_SUSPEND:
 #endif
-		err = line6_pcm_release(line6pcm, LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM);
+		err = line6_pcm_release(line6pcm,
+					LINE6_BIT_PCM_ALSA_PLAYBACK_STREAM);
 
 		if (err < 0)
 			return err;
-- 
1.7.12.1


  parent reply	other threads:[~2012-11-11 12:26 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-11 12:24 [PATCH 0/8] staging: line6: checkpatch.pl cleanups Stefan Hajnoczi
2012-11-11 12:24 ` [PATCH 1/8] staging: line6: wrap >80 char lines in capture.c Stefan Hajnoczi
2012-11-14 14:33   ` Dan Carpenter
2012-11-15 21:03     ` Markus Grabner
2012-11-15 21:38       ` Dan Carpenter
2012-11-15 22:12       ` Joe Perches
2012-11-15 23:43         ` Markus Grabner
2012-11-16  0:30           ` Joe Perches
2012-11-11 12:24 ` [PATCH 2/8] staging: line6: fix quoted string across lines in midibuf.c Stefan Hajnoczi
2012-11-11 12:24 ` [PATCH 3/8] staging: line6: shorten comment below 80 chars in pcm.c Stefan Hajnoczi
2012-11-11 12:24 ` [PATCH 4/8] staging: line6: drop trailing whitespace in pcm.h Stefan Hajnoczi
2012-11-11 12:24 ` Stefan Hajnoczi [this message]
2012-11-11 12:24 ` [PATCH 6/8] staging: line6: replace deprecated strict_strtol() in toneport.c Stefan Hajnoczi
2012-11-11 12:24 ` [PATCH 7/8] staging: line6: wrap lines to 80 chars in usbdefs.h Stefan Hajnoczi
2012-11-11 12:24 ` [PATCH 8/8] staging: line6: wrap comment to 80 chars in variax.c Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1352636686-31170-6-git-send-email-stefanha@gmail.com \
    --to=stefanha@gmail.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=grabner@icg.tugraz.at \
    --cc=gregkh@linuxfoundation.org \
    --cc=line6linux-devel@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=zonque@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox