staging: vc04_services: bcm2835-audio Fixed checkpatch issues

linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed

* staging: vc04_services: bcm2835-audio Fixed checkpatch issues
@ 2017-03-29  5:15 Andrea della Porta
  2017-03-29  5:15 ` [PATCH 1/3] Fixed checkpatch warning about unaligned function params Andrea della Porta
  0 siblings, 1 reply; 5+ messages in thread
From: Andrea della Porta @ 2017-03-29  5:15 UTC (permalink / raw)
  To: linux-arm-kernel

Fixed several chekpatch warnign about alignment of function parameters,
removed spaces after a cast, split one line that was over 80 chars

 .../vc04_services/bcm2835-audio/bcm2835-pcm.c      | 48 +++++++++++-----------
 1 file changed, 23 insertions(+), 25 deletions(-)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/3] Fixed checkpatch warning about unaligned function params
  2017-03-29  5:15 staging: vc04_services: bcm2835-audio Fixed checkpatch issues Andrea della Porta
@ 2017-03-29  5:15 ` Andrea della Porta
  2017-03-29  5:15   ` [PATCH 2/3] fixed codepatch coding style issue, line over 80 Andrea della Porta
  2017-04-08 10:57   ` [PATCH 1/3] Fixed checkpatch warning about unaligned function params Greg KH
  0 siblings, 2 replies; 5+ messages in thread
From: Andrea della Porta @ 2017-03-29  5:15 UTC (permalink / raw)
  To: linux-arm-kernel

Fixed issues:
CHECK: Alignment should match open parenthesis
#71: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:71:
+       audio_info("alsa_stream=%p substream=%p\n", alsa_stream,
+               alsa_stream ? alsa_stream->substream : 0);

CHECK: Alignment should match open parenthesis
#262: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:262:
+static int snd_bcm2835_pcm_hw_params(struct snd_pcm_substream *substream,
+       struct snd_pcm_hw_params *params)

CHECK: Alignment should match open parenthesis
#315: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:315:
+       err = bcm2835_audio_set_params(alsa_stream, channels,
+               alsa_stream->params_rate,

CHECK: Alignment should match open parenthesis
#384: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:384:
+               audio_debug("bcm2835_AUDIO_TRIGGER_START running=%d\n",
+                       alsa_stream->running);

CHECK: Alignment should match open parenthesis
#391: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:391:
+                                       bytes_to_frames(runtime,
+                                       alsa_stream->pos);

CHECK: Alignment should match open parenthesis
#436: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:436:
+       audio_debug("pcm_pointer... (%d) hwptr=%d appl=%d pos=%d\n", 0,
+               frames_to_bytes(runtime, runtime->status->hw_ptr),

CHECK: Alignment should match open parenthesis
#447: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:447:
+static int snd_bcm2835_pcm_lib_ioctl(struct snd_pcm_substream *substream,
+       unsigned int cmd, void *arg)

CHECK: Alignment should match open parenthesis
#452: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:452:
+       audio_info(" .. substream=%p, cmd=%d, arg=%p (%x) ret=%d\n", substream,
+               cmd, arg, arg ? *(unsigned *) arg : 0, ret);

CHECK: Alignment should match open parenthesis
#544: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:544:
+       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
+               snd_dma_continuous_data(GFP_KERNEL),

Signed-off-by: Andrea della Porta <sfaragnaus@gmail.com>
---
 .../vc04_services/bcm2835-audio/bcm2835-pcm.c      | 47 ++++++++++------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
index 8bd69b9..fa6d3d2 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
@@ -68,7 +68,7 @@ void bcm2835_playback_fifo(struct bcm2835_alsa_stream *alsa_stream)
 	audio_info(" .. IN\n");
 
 	audio_info("alsa_stream=%p substream=%p\n", alsa_stream,
-		alsa_stream ? alsa_stream->substream : 0);
+		   alsa_stream ? alsa_stream->substream : 0);
 
 	if (alsa_stream->open)
 		consumed = bcm2835_audio_retrieve_buffers(alsa_stream);
@@ -83,10 +83,10 @@ void bcm2835_playback_fifo(struct bcm2835_alsa_stream *alsa_stream)
 			new_period = 1;
 	}
 	audio_debug("updating pos cur: %d + %d max:%d period_bytes:%d, hw_ptr: %d new_period:%d\n",
-		alsa_stream->pos,
+		    alsa_stream->pos,
 		consumed,
 		alsa_stream->buffer_size,
-		(int) (alsa_stream->period_size * alsa_stream->substream->runtime->periods),
+		(int)(alsa_stream->period_size * alsa_stream->substream->runtime->periods),
 		frames_to_bytes(alsa_stream->substream->runtime, alsa_stream->substream->runtime->status->hw_ptr),
 		new_period);
 	if (alsa_stream->buffer_size) {
@@ -229,6 +229,7 @@ static int snd_bcm2835_playback_close(struct snd_pcm_substream *substream)
 	 */
 	if (alsa_stream->running) {
 		int err;
+
 		err = bcm2835_audio_stop(alsa_stream);
 		alsa_stream->running = 0;
 		if (err)
@@ -259,7 +260,7 @@ static int snd_bcm2835_playback_close(struct snd_pcm_substream *substream)
 
 /* hw_params callback */
 static int snd_bcm2835_pcm_hw_params(struct snd_pcm_substream *substream,
-	struct snd_pcm_hw_params *params)
+				     struct snd_pcm_hw_params *params)
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	struct bcm2835_alsa_stream *alsa_stream = runtime->private_data;
@@ -312,18 +313,16 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
 		channels = alsa_stream->channels;
 
 	err = bcm2835_audio_set_params(alsa_stream, channels,
-		alsa_stream->params_rate,
-		alsa_stream->pcm_format_width);
+				       alsa_stream->params_rate,
+				       alsa_stream->pcm_format_width);
 	if (err < 0)
 		audio_error(" error setting hw params\n");
 
-
 	bcm2835_audio_setup(alsa_stream);
 
 	/* in preparation of the stream, set the controls (volume level) of the stream */
 	bcm2835_audio_set_ctls(alsa_stream->chip);
 
-
 	memset(&alsa_stream->pcm_indirect, 0, sizeof(alsa_stream->pcm_indirect));
 
 	alsa_stream->pcm_indirect.hw_buffer_size =
@@ -335,8 +334,8 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
 	alsa_stream->pos = 0;
 
 	audio_debug("buffer_size=%d, period_size=%d pos=%d frame_bits=%d\n",
-		alsa_stream->buffer_size, alsa_stream->period_size,
-		alsa_stream->pos, runtime->frame_bits);
+		    alsa_stream->buffer_size, alsa_stream->period_size,
+		    alsa_stream->pos, runtime->frame_bits);
 
 	mutex_unlock(&chip->audio_mutex);
 	audio_info(" .. OUT\n");
@@ -344,17 +343,16 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
 }
 
 static void snd_bcm2835_pcm_transfer(struct snd_pcm_substream *substream,
-	struct snd_pcm_indirect *rec, size_t bytes)
+				     struct snd_pcm_indirect *rec, size_t bytes)
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	struct bcm2835_alsa_stream *alsa_stream = runtime->private_data;
-	void *src = (void *) (substream->runtime->dma_area + rec->sw_data);
+	void *src = (void *)(substream->runtime->dma_area + rec->sw_data);
 	int err;
 
 	err = bcm2835_audio_write(alsa_stream, bytes, src);
 	if (err)
 		audio_error(" Failed to transfer to alsa device (%d)\n", err);
-
 }
 
 static int snd_bcm2835_pcm_ack(struct snd_pcm_substream *substream)
@@ -381,14 +379,14 @@ static int snd_bcm2835_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 	switch (cmd) {
 	case SNDRV_PCM_TRIGGER_START:
 		audio_debug("bcm2835_AUDIO_TRIGGER_START running=%d\n",
-			alsa_stream->running);
+			    alsa_stream->running);
 		if (!alsa_stream->running) {
 			err = bcm2835_audio_start(alsa_stream);
 			if (!err) {
 				alsa_stream->pcm_indirect.hw_io =
 					alsa_stream->pcm_indirect.hw_data =
 					bytes_to_frames(runtime,
-					alsa_stream->pos);
+							alsa_stream->pos);
 				substream->ops->ack(substream);
 				alsa_stream->running = 1;
 				alsa_stream->draining = 1;
@@ -433,23 +431,23 @@ snd_bcm2835_pcm_pointer(struct snd_pcm_substream *substream)
 	audio_info(" .. IN\n");
 
 	audio_debug("pcm_pointer... (%d) hwptr=%d appl=%d pos=%d\n", 0,
-		frames_to_bytes(runtime, runtime->status->hw_ptr),
-		frames_to_bytes(runtime, runtime->control->appl_ptr),
-		alsa_stream->pos);
+		    frames_to_bytes(runtime, runtime->status->hw_ptr),
+		    frames_to_bytes(runtime, runtime->control->appl_ptr),
+		    alsa_stream->pos);
 
 	audio_info(" .. OUT\n");
 	return snd_pcm_indirect_playback_pointer(substream,
-		&alsa_stream->pcm_indirect,
-		alsa_stream->pos);
+						 &alsa_stream->pcm_indirect,
+						 alsa_stream->pos);
 }
 
 static int snd_bcm2835_pcm_lib_ioctl(struct snd_pcm_substream *substream,
-	unsigned int cmd, void *arg)
+				     unsigned int cmd, void *arg)
 {
 	int ret = snd_pcm_lib_ioctl(substream, cmd, arg);
 
 	audio_info(" .. substream=%p, cmd=%d, arg=%p (%x) ret=%d\n", substream,
-		cmd, arg, arg ? *(unsigned *) arg : 0, ret);
+		   cmd, arg, arg ? *(unsigned *)arg : 0, ret);
 	return ret;
 }
 
@@ -510,7 +508,6 @@ int snd_bcm2835_new_pcm(struct bcm2835_chip *chip, u32 numchannels)
 					      snd_bcm2835_playback_hw.buffer_bytes_max,
 					      snd_bcm2835_playback_hw.buffer_bytes_max);
 
-
 out:
 	mutex_unlock(&chip->audio_mutex);
 	audio_info(" .. OUT\n");
@@ -541,8 +538,8 @@ int snd_bcm2835_new_spdif_pcm(struct bcm2835_chip *chip)
 	/* pre-allocation of buffers */
 	/* NOTE: this may fail */
 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
-		snd_dma_continuous_data(GFP_KERNEL),
-		snd_bcm2835_playback_spdif_hw.buffer_bytes_max, snd_bcm2835_playback_spdif_hw.buffer_bytes_max);
+					      snd_dma_continuous_data(GFP_KERNEL),
+					      snd_bcm2835_playback_spdif_hw.buffer_bytes_max, snd_bcm2835_playback_spdif_hw.buffer_bytes_max);
 out:
 	mutex_unlock(&chip->audio_mutex);
 	audio_info(" .. OUT\n");
-- 
2.4.10

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/3] fixed codepatch coding style issue, line over 80
  2017-03-29  5:15 ` [PATCH 1/3] Fixed checkpatch warning about unaligned function params Andrea della Porta
@ 2017-03-29  5:15   ` Andrea della Porta
  2017-03-29  5:15     ` [PATCH 3/3] fixed extra space coding issue Andrea della Porta
  2017-04-08 10:57   ` [PATCH 1/3] Fixed checkpatch warning about unaligned function params Greg KH
  1 sibling, 1 reply; 5+ messages in thread
From: Andrea della Porta @ 2017-03-29  5:15 UTC (permalink / raw)
  To: linux-arm-kernel

Fixed issue:
WARNING: line over 80 characters
#545: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:545:
+               snd_bcm2835_playback_spdif_hw.buffer_bytes_max, snd_bcm2835_playback_spdif_hw.buffer_bytes_max);

Signed-off-by: Andrea della Porta <sfaragnaus@gmail.com>
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
index fa6d3d2..f1ce5cf 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
@@ -539,7 +539,8 @@ int snd_bcm2835_new_spdif_pcm(struct bcm2835_chip *chip)
 	/* NOTE: this may fail */
 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
 					      snd_dma_continuous_data(GFP_KERNEL),
-					      snd_bcm2835_playback_spdif_hw.buffer_bytes_max, snd_bcm2835_playback_spdif_hw.buffer_bytes_max);
+					      snd_bcm2835_playback_spdif_hw.buffer_bytes_max, 
+					      snd_bcm2835_playback_spdif_hw.buffer_bytes_max);
 out:
 	mutex_unlock(&chip->audio_mutex);
 	audio_info(" .. OUT\n");
-- 
2.4.10

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 3/3] fixed extra space coding issue
  2017-03-29  5:15   ` [PATCH 2/3] fixed codepatch coding style issue, line over 80 Andrea della Porta
@ 2017-03-29  5:15     ` Andrea della Porta
  0 siblings, 0 replies; 5+ messages in thread
From: Andrea della Porta @ 2017-03-29  5:15 UTC (permalink / raw)
  To: linux-arm-kernel

Removed an extra spaces at the end of the line

Signed-off-by: Andrea della Porta <sfaragnaus@gmail.com>
---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
index f1ce5cf..451942a 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
@@ -539,7 +539,7 @@ int snd_bcm2835_new_spdif_pcm(struct bcm2835_chip *chip)
 	/* NOTE: this may fail */
 	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
 					      snd_dma_continuous_data(GFP_KERNEL),
-					      snd_bcm2835_playback_spdif_hw.buffer_bytes_max, 
+					      snd_bcm2835_playback_spdif_hw.buffer_bytes_max,
 					      snd_bcm2835_playback_spdif_hw.buffer_bytes_max);
 out:
 	mutex_unlock(&chip->audio_mutex);
-- 
2.4.10

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 1/3] Fixed checkpatch warning about unaligned function params
  2017-03-29  5:15 ` [PATCH 1/3] Fixed checkpatch warning about unaligned function params Andrea della Porta
  2017-03-29  5:15   ` [PATCH 2/3] fixed codepatch coding style issue, line over 80 Andrea della Porta
@ 2017-04-08 10:57   ` Greg KH
  1 sibling, 0 replies; 5+ messages in thread
From: Greg KH @ 2017-04-08 10:57 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Mar 29, 2017 at 06:15:35AM +0100, Andrea della Porta wrote:
> Fixed issues:
> CHECK: Alignment should match open parenthesis
> #71: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:71:
> +       audio_info("alsa_stream=%p substream=%p\n", alsa_stream,
> +               alsa_stream ? alsa_stream->substream : 0);
> 
> CHECK: Alignment should match open parenthesis
> #262: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:262:
> +static int snd_bcm2835_pcm_hw_params(struct snd_pcm_substream *substream,
> +       struct snd_pcm_hw_params *params)
> 
> CHECK: Alignment should match open parenthesis
> #315: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:315:
> +       err = bcm2835_audio_set_params(alsa_stream, channels,
> +               alsa_stream->params_rate,
> 
> CHECK: Alignment should match open parenthesis
> #384: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:384:
> +               audio_debug("bcm2835_AUDIO_TRIGGER_START running=%d\n",
> +                       alsa_stream->running);
> 
> CHECK: Alignment should match open parenthesis
> #391: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:391:
> +                                       bytes_to_frames(runtime,
> +                                       alsa_stream->pos);
> 
> CHECK: Alignment should match open parenthesis
> #436: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:436:
> +       audio_debug("pcm_pointer... (%d) hwptr=%d appl=%d pos=%d\n", 0,
> +               frames_to_bytes(runtime, runtime->status->hw_ptr),
> 
> CHECK: Alignment should match open parenthesis
> #447: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:447:
> +static int snd_bcm2835_pcm_lib_ioctl(struct snd_pcm_substream *substream,
> +       unsigned int cmd, void *arg)
> 
> CHECK: Alignment should match open parenthesis
> #452: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:452:
> +       audio_info(" .. substream=%p, cmd=%d, arg=%p (%x) ret=%d\n", substream,
> +               cmd, arg, arg ? *(unsigned *) arg : 0, ret);
> 
> CHECK: Alignment should match open parenthesis
> #544: FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:544:
> +       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,
> +               snd_dma_continuous_data(GFP_KERNEL),
> 
> Signed-off-by: Andrea della Porta <sfaragnaus@gmail.com>
> ---
>  .../vc04_services/bcm2835-audio/bcm2835-pcm.c      | 47 ++++++++++------------
>  1 file changed, 22 insertions(+), 25 deletions(-)

Your email subject lines do not match other patches for this driver
(staging: drivername: file: what is happening).

Please fix up and resend all of these.

Also, no need to put the full checkpatch output in the changelog,
summarize it for us.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-04-08 10:57 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-29  5:15 staging: vc04_services: bcm2835-audio Fixed checkpatch issues Andrea della Porta
2017-03-29  5:15 ` [PATCH 1/3] Fixed checkpatch warning about unaligned function params Andrea della Porta
2017-03-29  5:15   ` [PATCH 2/3] fixed codepatch coding style issue, line over 80 Andrea della Porta
2017-03-29  5:15     ` [PATCH 3/3] fixed extra space coding issue Andrea della Porta
2017-04-08 10:57   ` [PATCH 1/3] Fixed checkpatch warning about unaligned function params Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).