* [PATCH v5 1/5] staging: bcm2835-audio: remove space after cast
2017-03-02 18:54 [PATCH v5 0/5] staging: bcm2835-audio: fix multiple checkpatch warnings Aishwarya Pant
@ 2017-03-02 18:54 ` Aishwarya Pant
2017-03-02 18:55 ` [PATCH v5 2/5] staging: bcm2835-audio: move logical continuation to the same line Aishwarya Pant
` (4 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Aishwarya Pant @ 2017-03-02 18:54 UTC (permalink / raw)
To: Stephen Warren, Lee Jones, Eric Anholt, Greg Kroah-Hartman,
Florian Fainelli, Ray Jui, Scott Branden,
bcm-kernel-feedback-list
Cc: outreachy-kernel
Remove instances of unnecessary blank space after cast in bcm2835-ctl.c
Signed-off-by: Aishwarya Pant <aishpant@gmail.com>
---
drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index a4ffa1b..99e9ca3 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -116,7 +116,7 @@ static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
return -EINTR;
if (kcontrol->private_value == PCM_PLAYBACK_VOLUME) {
- audio_info("Volume change attempted.. volume = %d new_volume = %d\n", chip->volume, (int) ucontrol->value.integer.value[0]);
+ audio_info("Volume change attempted.. volume = %d new_volume = %d\n", chip->volume, (int)ucontrol->value.integer.value[0]);
if (chip->mute == CTRL_VOL_MUTE) {
/* changed = toggle_mute(chip, CTRL_VOL_UNMUTE); */
changed = 1; /* should return 0 to signify no change but the mixer takes this as the opposite sign (no idea why) */
@@ -226,7 +226,7 @@ static int snd_bcm2835_spdif_default_put(struct snd_kcontrol *kcontrol,
return -EINTR;
for (i = 0; i < 4; i++)
- val |= (unsigned int) ucontrol->value.iec958.status[i] << (i * 8);
+ val |= (unsigned int)ucontrol->value.iec958.status[i] << (i * 8);
change = val != chip->spdif_status;
chip->spdif_status = val;
@@ -289,7 +289,7 @@ static int snd_bcm2835_spdif_stream_put(struct snd_kcontrol *kcontrol,
return -EINTR;
for (i = 0; i < 4; i++)
- val |= (unsigned int) ucontrol->value.iec958.status[i] << (i * 8);
+ val |= (unsigned int)ucontrol->value.iec958.status[i] << (i * 8);
change = val != chip->spdif_status;
chip->spdif_status = val;
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 2/5] staging: bcm2835-audio: move logical continuation to the same line
2017-03-02 18:54 [PATCH v5 0/5] staging: bcm2835-audio: fix multiple checkpatch warnings Aishwarya Pant
2017-03-02 18:54 ` [PATCH v5 1/5] staging: bcm2835-audio: remove space after cast Aishwarya Pant
@ 2017-03-02 18:55 ` Aishwarya Pant
2017-03-02 18:56 ` [PATCH v5 3/5] staging: bcm2835-audio: use kernel preferred block commenting style Aishwarya Pant
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Aishwarya Pant @ 2017-03-02 18:55 UTC (permalink / raw)
To: Stephen Warren, Lee Jones, Eric Anholt, Greg Kroah-Hartman,
Florian Fainelli, Ray Jui, Scott Branden,
bcm-kernel-feedback-list
Cc: outreachy-kernel
Keep logical continuations on the same line to improve code readability
Signed-off-by: Aishwarya Pant <aishpant@gmail.com>
---
drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index 99e9ca3..17d34c0 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -122,8 +122,7 @@ static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
changed = 1; /* should return 0 to signify no change but the mixer takes this as the opposite sign (no idea why) */
goto unlock;
}
- if (changed
- || (ucontrol->value.integer.value[0] != chip2alsa(chip->volume))) {
+ if (changed || (ucontrol->value.integer.value[0] != chip2alsa(chip->volume))) {
chip->volume = alsa2chip(ucontrol->value.integer.value[0]);
changed = 1;
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 3/5] staging: bcm2835-audio: use kernel preferred block commenting style
2017-03-02 18:54 [PATCH v5 0/5] staging: bcm2835-audio: fix multiple checkpatch warnings Aishwarya Pant
2017-03-02 18:54 ` [PATCH v5 1/5] staging: bcm2835-audio: remove space after cast Aishwarya Pant
2017-03-02 18:55 ` [PATCH v5 2/5] staging: bcm2835-audio: move logical continuation to the same line Aishwarya Pant
@ 2017-03-02 18:56 ` Aishwarya Pant
2017-03-02 18:57 ` [PATCH v5 4/5] staging: bcm2835-audio: remove extra blank line Aishwarya Pant
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Aishwarya Pant @ 2017-03-02 18:56 UTC (permalink / raw)
To: Stephen Warren, Lee Jones, Eric Anholt, Greg Kroah-Hartman,
Florian Fainelli, Ray Jui, Scott Branden,
bcm-kernel-feedback-list
Cc: outreachy-kernel
Fix block comment formatting to suppress the following warning thrown by
checkpatch: Block comments use a trailing */ on a separate line
Signed-off-by: Aishwarya Pant <aishpant@gmail.com>
---
drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index 17d34c0..80b2062 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -245,9 +245,10 @@ 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)
{
- /* bcm2835 supports only consumer mode and sets all other format flags
- * automatically. So the only thing left is signalling non-audio
- * content */
+ /*
+ * bcm2835 supports only consumer mode and sets all other format flags
+ * automatically. So the only thing left is signalling non-audio content
+ */
ucontrol->value.iec958.status[0] = IEC958_AES0_NONAUDIO;
return 0;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 4/5] staging: bcm2835-audio: remove extra blank line
2017-03-02 18:54 [PATCH v5 0/5] staging: bcm2835-audio: fix multiple checkpatch warnings Aishwarya Pant
` (2 preceding siblings ...)
2017-03-02 18:56 ` [PATCH v5 3/5] staging: bcm2835-audio: use kernel preferred block commenting style Aishwarya Pant
@ 2017-03-02 18:57 ` Aishwarya Pant
2017-03-02 18:58 ` [PATCH v5 5/5] staging: bcm2835-audio: replace printk(KERN_ERR...) with dev_err(...) Aishwarya Pant
2017-03-03 14:28 ` [Outreachy kernel] [PATCH v5 0/5] staging: bcm2835-audio: fix multiple checkpatch warnings Daniel Baluta
5 siblings, 0 replies; 8+ messages in thread
From: Aishwarya Pant @ 2017-03-02 18:57 UTC (permalink / raw)
To: Stephen Warren, Lee Jones, Eric Anholt, Greg Kroah-Hartman,
Florian Fainelli, Ray Jui, Scott Branden,
bcm-kernel-feedback-list
Cc: outreachy-kernel
Fix the warning: Blank lines aren't necessary after an open brace
'{' issued by checkpatch on bcm2835-ctl.c
Signed-off-by: Aishwarya Pant <aishpant@gmail.com>
---
drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index 80b2062..46814fd 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -123,7 +123,6 @@ static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
goto unlock;
}
if (changed || (ucontrol->value.integer.value[0] != chip2alsa(chip->volume))) {
-
chip->volume = alsa2chip(ucontrol->value.integer.value[0]);
changed = 1;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v5 5/5] staging: bcm2835-audio: replace printk(KERN_ERR...) with dev_err(...)
2017-03-02 18:54 [PATCH v5 0/5] staging: bcm2835-audio: fix multiple checkpatch warnings Aishwarya Pant
` (3 preceding siblings ...)
2017-03-02 18:57 ` [PATCH v5 4/5] staging: bcm2835-audio: remove extra blank line Aishwarya Pant
@ 2017-03-02 18:58 ` Aishwarya Pant
2017-03-02 22:16 ` [Outreachy kernel] " Julia Lawall
2017-03-03 14:28 ` [Outreachy kernel] [PATCH v5 0/5] staging: bcm2835-audio: fix multiple checkpatch warnings Daniel Baluta
5 siblings, 1 reply; 8+ messages in thread
From: Aishwarya Pant @ 2017-03-02 18:58 UTC (permalink / raw)
To: Stephen Warren, Lee Jones, Eric Anholt, Greg Kroah-Hartman,
Florian Fainelli, Ray Jui, Scott Branden,
bcm-kernel-feedback-list
Cc: outreachy-kernel
Use dev_err(... in place of printk(KERN_ERR ...
Problem found by checkpatch
Signed-off-by: Aishwarya Pant <aishpant@gmail.com>
---
Changes in v3:
-Merge two if conditions
-Edit subject and commit message
Changes in v2:
-Prefer dev_err to pr_err where device information is available
drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index 46814fd..659c3d1 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -139,10 +139,8 @@ static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
}
}
- if (changed) {
- if (bcm2835_audio_set_ctls(chip))
- printk(KERN_ERR "Failed to set ALSA controls..\n");
- }
+ if (changed && bcm2835_audio_set_ctls(chip))
+ dev_err(chip->card->dev, "Failed to set ALSA controls..\n");
unlock:
mutex_unlock(&chip->audio_mutex);
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [Outreachy kernel] [PATCH v5 5/5] staging: bcm2835-audio: replace printk(KERN_ERR...) with dev_err(...)
2017-03-02 18:58 ` [PATCH v5 5/5] staging: bcm2835-audio: replace printk(KERN_ERR...) with dev_err(...) Aishwarya Pant
@ 2017-03-02 22:16 ` Julia Lawall
0 siblings, 0 replies; 8+ messages in thread
From: Julia Lawall @ 2017-03-02 22:16 UTC (permalink / raw)
To: Aishwarya Pant
Cc: Stephen Warren, Lee Jones, Eric Anholt, Greg Kroah-Hartman,
Florian Fainelli, Ray Jui, Scott Branden,
bcm-kernel-feedback-list, outreachy-kernel
On Fri, 3 Mar 2017, Aishwarya Pant wrote:
> Use dev_err(... in place of printk(KERN_ERR ...
> Problem found by checkpatch
>
> Signed-off-by: Aishwarya Pant <aishpant@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
>
> ---
> Changes in v3:
> -Merge two if conditions
> -Edit subject and commit message
> Changes in v2:
> -Prefer dev_err to pr_err where device information is available
>
> drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> index 46814fd..659c3d1 100644
> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
> @@ -139,10 +139,8 @@ static int snd_bcm2835_ctl_put(struct snd_kcontrol *kcontrol,
> }
> }
>
> - if (changed) {
> - if (bcm2835_audio_set_ctls(chip))
> - printk(KERN_ERR "Failed to set ALSA controls..\n");
> - }
> + if (changed && bcm2835_audio_set_ctls(chip))
> + dev_err(chip->card->dev, "Failed to set ALSA controls..\n");
>
> unlock:
> mutex_unlock(&chip->audio_mutex);
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/9c5b6857fe9d2fd5076d099cdc950468615175c5.1488480443.git.aishpant%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Outreachy kernel] [PATCH v5 0/5] staging: bcm2835-audio: fix multiple checkpatch warnings
2017-03-02 18:54 [PATCH v5 0/5] staging: bcm2835-audio: fix multiple checkpatch warnings Aishwarya Pant
` (4 preceding siblings ...)
2017-03-02 18:58 ` [PATCH v5 5/5] staging: bcm2835-audio: replace printk(KERN_ERR...) with dev_err(...) Aishwarya Pant
@ 2017-03-03 14:28 ` Daniel Baluta
5 siblings, 0 replies; 8+ messages in thread
From: Daniel Baluta @ 2017-03-03 14:28 UTC (permalink / raw)
To: Aishwarya Pant
Cc: Stephen Warren, Lee Jones, Eric Anholt, Greg Kroah-Hartman,
Florian Fainelli, Ray Jui, Scott Branden,
bcm-kernel-feedback-list, outreachy-kernel
On Thu, Mar 2, 2017 at 8:54 PM, Aishwarya Pant <aishpant@gmail.com> wrote:
> Fix multiple code styling warnings issued by checkpatch on file
> bcm2835-ctl.c in bcm2835-audio driver
>
>
> Changes in v5:
> -Fix out of place commit messages
> Changes in v4:
> -Refactor commit messages
> Changes in v3:
> -Merge two if conditions
> -Fix subject of patch replace printk(... by dev_err(...
> Changes in v2:
> -Replace pr_err with dev_err
>
> Aishwarya Pant (5):
> *** HERE ***
This string ^^^^ should be deleted :).
^ permalink raw reply [flat|nested] 8+ messages in thread