[PATCH 1/4] Staging: bcm2835-audio: bcm2835.h: fixed checkpatch warning

[PATCH 1/4] Staging: bcm2835-audio: bcm2835.h: fixed checkpatch warning

[Manoj Sawai]

Fixed a checkpatch.pl about coding style in comments.
'*' missing on subsequent lines.

Signed-off-by: Manoj Sawai <mas@iitkgp.ac.in>
---
 drivers/staging/bcm2835-audio/bcm2835.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/bcm2835-audio/bcm2835.h b/drivers/staging/bcm2835-audio/bcm2835.h
index 36e3ef8..cddbe06 100644
--- a/drivers/staging/bcm2835-audio/bcm2835.h
+++ b/drivers/staging/bcm2835-audio/bcm2835.h
@@ -27,8 +27,8 @@
 #include <linux/workqueue.h>
 
 /*
-#define AUDIO_DEBUG_ENABLE
-#define AUDIO_VERBOSE_DEBUG_ENABLE
+ *#define AUDIO_DEBUG_ENABLE
+ *#define AUDIO_VERBOSE_DEBUG_ENABLE
  */
 
 /* Debug macros */
-- 
2.7.4

[PATCH 2/4] Staging: bcm2835-audio: bcm835-ctl.c: fixed checkpatch warning

[Manoj Sawai]

Fixed the following warning :
"drivers/staging/bcm2835-audio/bcm2835-ctl.c:251: WARNING: Block comments
use a trailing */ on a separate line"

Signed-off-by: Manoj Sawai <mas@iitkgp.ac.in>
---
 drivers/staging/bcm2835-audio/bcm2835-ctl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/bcm2835-audio/bcm2835-ctl.c
index a4ffa1b..1dd68c1 100644
--- a/drivers/staging/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/bcm2835-audio/bcm2835-ctl.c
@@ -248,7 +248,8 @@ static int snd_bcm2835_spdif_mask_get(struct snd_kcontrol *kcontrol,
 {
 	/* bcm2835 supports only consumer mode and sets all other format flags
 	 * automatically. So the only thing left is signalling non-audio
-	 * content */
+	 * content
+	 */
 	ucontrol->value.iec958.status[0] = IEC958_AES0_NONAUDIO;
 	return 0;
 }
-- 
2.7.4

[PATCH 3/4] Staging: bcm2835-audio: bcm2835-pcm.c: brace coding style issue

[Manoj Sawai]

fixed the following checkpatch.pl warning:

"drivers/staging/bcm2835-audio/bcm2835-pcm.c:320: WARNING: braces {} are
not necessary for single statement blocks"

Signed-off-by: Manoj Sawai <mas@iitkgp.ac.in>
---
 drivers/staging/bcm2835-audio/bcm2835-pcm.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/bcm2835-audio/bcm2835-pcm.c
index 16127e0..b03022d 100644
--- a/drivers/staging/bcm2835-audio/bcm2835-pcm.c
+++ b/drivers/staging/bcm2835-audio/bcm2835-pcm.c
@@ -308,7 +308,8 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
 
 	/* notify the vchiq that it should enter spdif passthrough mode by
 	 * setting channels=0 (see
-	 * https://github.com/raspberrypi/linux/issues/528) */
+	 * https://github.com/raspberrypi/linux/issues/528)
+	 */
 	if (chip->spdif_status & IEC958_AES0_NONAUDIO)
 		channels = 0;
 	else
@@ -317,9 +318,9 @@ static int snd_bcm2835_pcm_prepare(struct snd_pcm_substream *substream)
 	err = bcm2835_audio_set_params(alsa_stream, channels,
 		alsa_stream->params_rate,
 		alsa_stream->pcm_format_width);
-	if (err < 0) {
+
+	if (err < 0)
 		audio_error(" error setting hw params\n");
-	}
 
 	bcm2835_audio_setup(alsa_stream);
 
-- 
2.7.4

[PATCH 4/4] Staging: bcm2835-audio: bcm2835-vchiq.c: lines over 80 character limit

[Manoj Sawai]

Trimmed lines that were unnecessarily over 80 characters long.

Signed-off-by: Manoj Sawai <mas@iitkgp.ac.in>
---
 drivers/staging/bcm2835-audio/bcm2835-vchiq.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/bcm2835-audio/bcm2835-vchiq.c
index fa23a13..70a9ed5 100644
--- a/drivers/staging/bcm2835-audio/bcm2835-vchiq.c
+++ b/drivers/staging/bcm2835-audio/bcm2835-vchiq.c
@@ -31,12 +31,12 @@
 
 #include "bcm2835.h"
 
-/* ---- Include Files -------------------------------------------------------- */
+/*---- Include Files ----------------*/
 
 #include "interface/vchi/vchi.h"
 #include "vc_vchi_audioserv_defs.h"
 
-/* ---- Private Constants and Types ------------------------------------------ */
+/*--- Private Constants and Types ---*/
 
 #define BCM2835_AUDIO_STOP           0
 #define BCM2835_AUDIO_START          1
@@ -67,11 +67,11 @@ struct bcm2835_audio_instance {
 
 static bool force_bulk;
 
-/* ---- Private Variables ---------------------------------------------------- */
+/*---- Private Variables --------------*/
 
-/* ---- Private Function Prototypes ------------------------------------------ */
+/*---- Private Function Prototypes ----*/
 
-/* ---- Private Functions ---------------------------------------------------- */
+/*---- Private Functions --------------*/
 
 static int bcm2835_audio_stop_worker(struct bcm2835_alsa_stream *alsa_stream);
 static int bcm2835_audio_start_worker(struct bcm2835_alsa_stream *alsa_stream);
-- 
2.7.4

Re: [PATCH 1/4] Staging: bcm2835-audio: bcm2835.h: fixed checkpatch warning

[Greg KH]

On Fri, Feb 24, 2017 at 08:55:14PM +0530, Manoj Sawai wrote:
> Fixed a checkpatch.pl about coding style in comments.
> '*' missing on subsequent lines.
> 
> Signed-off-by: Manoj Sawai <mas@iitkgp.ac.in>
> ---
>  drivers/staging/bcm2835-audio/bcm2835.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

This patch series does not apply to my staging-testing branch due to
other people sending in some of these already.  Please rebase and
resend.

thanks,

greg k-h