Skip to contentSkip to conversation

staging: bcm2835-audio: minor code style cleanups

PATCH New Adrien Thierry 1 participant 6 messages Apr 14, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover staging: bcm2835-audio: minor code style cleanups

This series contains minor code style cleanups to fix checkpatch warnings.

This handles TODO item "Fix the remaining checkpatch.pl errors and warnings"

---

Changes since v1:
- removed mention of vc4 in Kconfig help text
- split patches so that each patch fixes only one checkpatch warning

Adrien Thierry (5):
staging: bcm2835-audio: fully describe config symbol
staging: bcm2835-audio: fix line ending with '('
staging: bcm2835-audio: fix unnecessary space after cast
staging: bcm2835-audio: fix mutex definition without comment
staging: bcm2835-audio: fix mutex definition without comment

 drivers/staging/vc04_services/bcm2835-audio/Kconfig         | 6 ++++--
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c   | 5 ++---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c | 2 +-
 drivers/staging/vc04_services/bcm2835-audio/bcm2835.h       | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

base-commit: 194193dd06848c1839d928090cb2032eec8b2f9c

Signature · 1 line
2.35.1
#1 lore raw

PATCH v2 1/5 staging: bcm2835-audio: fully describe config symbol

Explain SND_BCM2835 config option in more detail to fix checkpatch warning:

WARNING: please write a help paragraph that fully describes the config symbol
FILE: drivers/staging/vc04_services/bcm2835-audio/Kconfig:2

---
 drivers/staging/vc04_services/bcm2835-audio/Kconfig | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/staging/vc04_services/bcm2835-audio/Kconfig +4 -2
index d32ea348e846..307f2d6a9599 100644
@@ -5,5 +5,7 @@ config SND_BCM2835
 	select SND_PCM
 	select BCM2835_VCHIQ
 	help
-	  Say Y or M if you want to support BCM2835 built in audio
-
+	  Say Y or M if you want to support BCM2835 built in audio.
+	  This driver handles both 3.5mm and HDMI audio, by leveraging
+	  the VCHIQ messaging interface between the kernel and the firmware
+	  running on VideoCore.
\ No newline at end of file
Signature · 1 line
2.35.1
#2 lore raw

PATCH v2 2/5 staging: bcm2835-audio: fix line ending with '('

In reply to Adrien Thierry

Fix issue reported by checkpatch:

CHECK: Lines should not end with a '('
FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:85:

---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +1 -2
index f2ef1d641e70..856d3c022f80 100644
@@ -82,8 +82,7 @@ void bcm2835_playback_fifo(struct bcm2835_alsa_stream *alsa_stream,
 }
 
 /* open callback */
-static int snd_bcm2835_playback_open_generic(
-	struct snd_pcm_substream *substream, int spdif)
+static int snd_bcm2835_playback_open_generic(struct snd_pcm_substream *substream, int spdif)
 {
 	struct bcm2835_chip *chip = snd_pcm_substream_chip(substream);
 	struct snd_pcm_runtime *runtime = substream->runtime;
Signature · 1 line
2.35.1
#3 lore raw

PATCH v2 3/5 staging: bcm2835-audio: fix unnecessary space after cast

In reply to Adrien Thierry

Fix issue reported by checkpatch:

CHECK: No space is necessary after a cast
FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c:240:

---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +1 -1
index 856d3c022f80..68e8d491a7ec 100644
@@ -236,7 +236,7 @@ static void snd_bcm2835_pcm_transfer(struct snd_pcm_substream *substream,
 {
 	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);
 
 	bcm2835_audio_write(alsa_stream, bytes, src);
 }
Signature · 1 line
2.35.1
#4 lore raw

PATCH v2 4/5 staging: bcm2835-audio: fix mutex definition without comment

In reply to Adrien Thierry

Fix issue reported by checkpatch:

CHECK: struct mutex definition without comment
FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c:14:

---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c +1 -1
index d567a2e3f70c..e429b33b4d39 100644
@@ -11,7 +11,7 @@ struct bcm2835_audio_instance {
 	struct device *dev;
 	unsigned int service_handle;
 	struct completion msg_avail_comp;
-	struct mutex vchi_mutex;
+	struct mutex vchi_mutex; /* Serialize vchiq access */
 	struct bcm2835_alsa_stream *alsa_stream;
 	int result;
 	unsigned int max_packet;
Signature · 1 line
2.35.1
#5 lore raw

PATCH v2 5/5 staging: bcm2835-audio: fix mutex definition without comment

In reply to Adrien Thierry

Fix issue reported by checkpatch:

CHECK: struct mutex definition without comment
FILE: drivers/staging/vc04_services/bcm2835-audio/bcm2835.h:64:

---
 drivers/staging/vc04_services/bcm2835-audio/bcm2835.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vc04_services/bcm2835-audio/bcm2835.h +1 -1
index 51066ac8eea5..38b7451d77b2 100644
@@ -61,7 +61,7 @@ struct bcm2835_chip {
 
 	unsigned int opened;
 	unsigned int spdif_status;
-	struct mutex audio_mutex;
+	struct mutex audio_mutex; /* Serialize chip data access */
 
 	struct bcm2835_vchi_ctx *vchi_ctx;
 };
Signature · 1 line
2.35.1