Skip to contentSkip to conversation

staging: bcm2835-audio: match alignment with open parenthesis

PATCH In review Aishwarya Pant 2 participants 4 messages Mar 5, 2017 – Mar 6, 2017

Subsystems (3)
Staging Broadcom BCM2711/BCM2835 Arm architecture Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture
lore
Share & tools
lore

Aishwarya Pant

author
#0 lore raw

cover staging: bcm2835-audio: match alignment with open parenthesis

Patch fixes the following checkpatch warning issued on bcm2835-ctl.c and bcm2835-pcm.c- CHECK: Alignment should match open parenthesis

Aishwarya Pant (2):
staging: bcm2835-audio: match alignment with open parenthesis
staging: bcm2835-audio: match alignment with open parenthesis

 .../vc04_services/bcm2835-audio/bcm2835-ctl.c      | 18 ++++-----
 .../vc04_services/bcm2835-audio/bcm2835-pcm.c      | 47 +++++++++++-----------
 2 files changed, 33 insertions(+), 32 deletions(-)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/2 staging: bcm2835-audio: match alignment with open parenthesis

Patch fixes the following warning issued by checkpatch on bcm2835-ctl.c in bcm-audio driver: CHECK: Alignment should match open parenthesis

Signed-off-by Aishwarya Pant <[email protected]>
---
 .../staging/vc04_services/bcm2835-audio/bcm2835-ctl.c  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c +9 -9
index a4ffa1b..063e6f4 100644
@@ -107,7 +107,7 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
 }
 
 static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_value *ucontrol)
+			       struct snd_ctl_elem_value *ucontrol)
 {
 	struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
 	int changed = 0;

@@ -191,7 +191,7 @@ static struct snd_kcontrol_new snd_bcm2835_ctl[] = {
 };
 
 static int snd_bcm2835_spdif_default_info(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_info *uinfo)
+					  struct snd_ctl_elem_info *uinfo)
 {
 	uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
 	uinfo->count = 1;

@@ -199,7 +199,7 @@ static int snd_bcm2835_spdif_default_info(struct snd_kcontrol *kcontrol,
 }
 
 static int snd_bcm2835_spdif_default_get(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_value *ucontrol)
+					 struct snd_ctl_elem_value *ucontrol)
 {
 	struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
 	int i;

@@ -216,7 +216,7 @@ static int snd_bcm2835_spdif_default_get(struct snd_kcontrol *kcontrol,
 }
 
 static int snd_bcm2835_spdif_default_put(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_value *ucontrol)
+					 struct snd_ctl_elem_value *ucontrol)
 {
 	struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
 	unsigned int val = 0;

@@ -236,7 +236,7 @@ static int snd_bcm2835_spdif_default_put(struct snd_kcontrol *kcontrol,
 }
 
 static int snd_bcm2835_spdif_mask_info(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_info *uinfo)
+				       struct snd_ctl_elem_info *uinfo)
 {
 	uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
 	uinfo->count = 1;

@@ -244,7 +244,7 @@ static int snd_bcm2835_spdif_mask_info(struct snd_kcontrol *kcontrol,
 }
 
 static int snd_bcm2835_spdif_mask_get(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_value *ucontrol)
+				      struct snd_ctl_elem_value *ucontrol)
 {
 	/* bcm2835 supports only consumer mode and sets all other format flags
 	 * automatically. So the only thing left is signalling non-audio

@@ -254,7 +254,7 @@ static int snd_bcm2835_spdif_mask_get(struct snd_kcontrol *kcontrol,
 }
 
 static int snd_bcm2835_spdif_stream_info(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_info *uinfo)
+					 struct snd_ctl_elem_info *uinfo)
 {
 	uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
 	uinfo->count = 1;

@@ -262,7 +262,7 @@ static int snd_bcm2835_spdif_stream_info(struct snd_kcontrol *kcontrol,
 }
 
 static int snd_bcm2835_spdif_stream_get(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_value *ucontrol)
+					struct snd_ctl_elem_value *ucontrol)
 {
 	struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
 	int i;

@@ -279,7 +279,7 @@ static int snd_bcm2835_spdif_stream_get(struct snd_kcontrol *kcontrol,
 }
 
 static int snd_bcm2835_spdif_stream_put(struct snd_kcontrol *kcontrol,
-	struct snd_ctl_elem_value *ucontrol)
+					struct snd_ctl_elem_value *ucontrol)
 {
 	struct bcm2835_chip *chip = snd_kcontrol_chip(kcontrol);
 	unsigned int val = 0;
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 2/2 staging: bcm2835-audio: match alignment with open parenthesis

In reply to Aishwarya Pant

Patch fixes the following warning issued by checkpatch on bcm2835-pcm.c in bcm-audio driver: CHECK: Alignment should match open parenthesis

Signed-off-by Aishwarya Pant <[email protected]>
---
 .../vc04_services/bcm2835-audio/bcm2835-pcm.c      | 47 +++++++++++-----------
 1 file changed, 24 insertions(+), 23 deletions(-)
drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +24 -23
index d60d702..6307b86 100644
@@ -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,12 +83,13 @@ 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,
-		consumed,
-		alsa_stream->buffer_size,
-		(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);
+		    alsa_stream->pos,
+		    consumed,
+		    alsa_stream->buffer_size,
+		    (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) {
 		alsa_stream->pos += consumed & ~(1 << 30);
 		alsa_stream->pos %= alsa_stream->buffer_size;

@@ -261,7 +262,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;

@@ -314,8 +315,8 @@ 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");
 

@@ -337,8 +338,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");

@@ -346,7 +347,7 @@ 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;

@@ -383,14 +384,13 @@ 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);
+					bytes_to_frames(runtime, alsa_stream->pos);
 				substream->ops->ack(substream);
 				alsa_stream->running = 1;
 				alsa_stream->draining = 1;

@@ -435,9 +435,9 @@ 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,

@@ -446,12 +446,12 @@ snd_bcm2835_pcm_pointer(struct snd_pcm_substream *substream)
 }
 
 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;
 }
 

@@ -543,8 +543,9 @@ 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");
Signature · 1 line
2.7.4
maintainer
#3 lore raw
In reply to Aishwarya Pant
Quoted 6 lines · Aishwarya Pant

Patch fixes the following checkpatch warning issued on bcm2835-ctl.c and bcm2835-pcm.c- CHECK: Alignment should match open parenthesis

Aishwarya Pant (2):
staging: bcm2835-audio: match alignment with open parenthesis
staging: bcm2835-audio: match alignment with open parenthesis

These both have identical subject lines, which means they must do the exact same thing :(

Please fix up.

thanks,

greg k-h