diff mbox series

[v2,18/21] ASoC: samsung: i2s: Comments clean up

Message ID 20190212180342.32040-19-s.nawrocki@samsung.com (mailing list archive)
State Not Applicable
Headers show
Series ASoC: dmaengine updates, secondary CPU DAI for Odroid boards | expand

Commit Message

Spelling error fixes, upper/lower case letter changes.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
---
 sound/soc/samsung/i2s.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

Comments

Krzysztof Kozlowski Feb. 13, 2019, 8:06 a.m. UTC | #1
On Tue, 12 Feb 2019 at 19:05, Sylwester Nawrocki <s.nawrocki@samsung.com> wrote:
>
> Spelling error fixes, upper/lower case letter changes.
>
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> ---
>  sound/soc/samsung/i2s.c | 29 +++++++++++++++--------------
>  1 file changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
> index debeaf51cc7e..77c0f70beab1 100644
> --- a/sound/soc/samsung/i2s.c
> +++ b/sound/soc/samsung/i2s.c
> @@ -1,5 +1,4 @@
> -/* sound/soc/samsung/i2s.c
> - *
> +/*
>   * ALSA SoC Audio Layer - Samsung I2S Controller driver
>   *
>   * Copyright (c) 2010 Samsung Electronics Co. Ltd.
> @@ -61,10 +60,10 @@ struct i2s_dai {
>         /* Platform device for this DAI */
>         struct platform_device *pdev;
>
> -       /* Frame Clock */
> +       /* Frame clock */
>         unsigned frmclk;
>         /*
> -        * Specifically requested RCLK,BCLK by MACHINE Driver.
> +        * Specifically requested RCLK, BCLK by machine driver.
>          * 0 indicates CPU driver is free to choose any value.
>          */
>         unsigned rfs, bfs;
> @@ -72,8 +71,9 @@ struct i2s_dai {
>         struct i2s_dai *pri_dai;
>         /* Pointer to the Secondary_Fifo if it has one, NULL otherwise */
>         struct i2s_dai *sec_dai;
> -#define DAI_OPENED     (1 << 0) /* Dai is opened */
> -#define DAI_MANAGER    (1 << 1) /* Dai is the manager */
> +
> +#define DAI_OPENED     (1 << 0) /* DAI is opened */
> +#define DAI_MANAGER    (1 << 1) /* DAI is the manager */
>         unsigned mode;
>
>         /* Driver for this DAI */
> @@ -98,7 +98,7 @@ struct samsung_i2s_priv {
>         /* Spinlock protecting access to the device's registers */
>         spinlock_t lock;
>
> -       /* Lock for cross i/f checks */
> +       /* Lock for cross interface checks */
>         spinlock_t pcm_lock;
>
>         /* CPU DAIs and their corresponding drivers */
> @@ -309,7 +309,7 @@ static inline void set_rfs(struct i2s_dai *i2s, unsigned rfs)
>         writel(mod, priv->addr + I2SMOD);
>  }
>
> -/* Read Bit-Clock of I2S (in multiples of LRCLK) */
> +/* Read bit-clock of I2S (in multiples of LRCLK) */
>  static inline unsigned get_bfs(struct i2s_dai *i2s)
>  {
>         struct samsung_i2s_priv *priv = i2s->priv;
> @@ -331,7 +331,7 @@ static inline unsigned get_bfs(struct i2s_dai *i2s)
>         }
>  }
>
> -/* Write Bit-Clock of I2S (in multiples of LRCLK) */
> +/* Write bit-clock of I2S (in multiples of LRCLK) */
>  static inline void set_bfs(struct i2s_dai *i2s, unsigned bfs)
>  {
>         struct samsung_i2s_priv *priv = i2s->priv;
> @@ -383,7 +383,7 @@ static inline void set_bfs(struct i2s_dai *i2s, unsigned bfs)
>         writel(mod, priv->addr + I2SMOD);
>  }
>
> -/* Sample-Size */
> +/* Sample size */
>  static inline int get_blc(struct i2s_dai *i2s)
>  {
>         int blc = readl(i2s->priv->addr + I2SMOD);
> @@ -397,7 +397,7 @@ static inline int get_blc(struct i2s_dai *i2s)
>         }
>  }
>
> -/* TX Channel Control */
> +/* TX channel control */
>  static void i2s_txctrl(struct i2s_dai *i2s, int on)
>  {
>         struct samsung_i2s_priv *priv = i2s->priv;
> @@ -742,7 +742,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
>         switch (params_channels(params)) {
>         case 6:
>                 val |= MOD_DC2_EN;
> -               /* fall through */
> +               /* Fall through */

Just to be sure - did you check whether this passes GCC
-Wimplicit-fallthrough=3 (you need GCC v7)? It looks correct - like
one of accepted patterns
(https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html).

Rest looks good so:
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof
On 2/13/19 09:06, Krzysztof Kozlowski wrote:
>> @@ -742,7 +742,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream,
>>         switch (params_channels(params)) {
>>         case 6:
>>                 val |= MOD_DC2_EN;
>> -               /* fall through */
>> +               /* Fall through */

> Just to be sure - did you check whether this passes GCC
> -Wimplicit-fallthrough=3 (you need GCC v7)? It looks correct - like
> one of accepted patterns
> (https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html).

I just checked it now and with comment in upper case the warning 
is also being suppressed.
diff mbox series

Patch

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index debeaf51cc7e..77c0f70beab1 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1,5 +1,4 @@ 
-/* sound/soc/samsung/i2s.c
- *
+/*
  * ALSA SoC Audio Layer - Samsung I2S Controller driver
  *
  * Copyright (c) 2010 Samsung Electronics Co. Ltd.
@@ -61,10 +60,10 @@  struct i2s_dai {
 	/* Platform device for this DAI */
 	struct platform_device *pdev;
 
-	/* Frame Clock */
+	/* Frame clock */
 	unsigned frmclk;
 	/*
-	 * Specifically requested RCLK,BCLK by MACHINE Driver.
+	 * Specifically requested RCLK, BCLK by machine driver.
 	 * 0 indicates CPU driver is free to choose any value.
 	 */
 	unsigned rfs, bfs;
@@ -72,8 +71,9 @@  struct i2s_dai {
 	struct i2s_dai *pri_dai;
 	/* Pointer to the Secondary_Fifo if it has one, NULL otherwise */
 	struct i2s_dai *sec_dai;
-#define DAI_OPENED	(1 << 0) /* Dai is opened */
-#define DAI_MANAGER	(1 << 1) /* Dai is the manager */
+
+#define DAI_OPENED	(1 << 0) /* DAI is opened */
+#define DAI_MANAGER	(1 << 1) /* DAI is the manager */
 	unsigned mode;
 
 	/* Driver for this DAI */
@@ -98,7 +98,7 @@  struct samsung_i2s_priv {
 	/* Spinlock protecting access to the device's registers */
 	spinlock_t lock;
 
-	/* Lock for cross i/f checks */
+	/* Lock for cross interface checks */
 	spinlock_t pcm_lock;
 
 	/* CPU DAIs and their corresponding drivers */
@@ -309,7 +309,7 @@  static inline void set_rfs(struct i2s_dai *i2s, unsigned rfs)
 	writel(mod, priv->addr + I2SMOD);
 }
 
-/* Read Bit-Clock of I2S (in multiples of LRCLK) */
+/* Read bit-clock of I2S (in multiples of LRCLK) */
 static inline unsigned get_bfs(struct i2s_dai *i2s)
 {
 	struct samsung_i2s_priv *priv = i2s->priv;
@@ -331,7 +331,7 @@  static inline unsigned get_bfs(struct i2s_dai *i2s)
 	}
 }
 
-/* Write Bit-Clock of I2S (in multiples of LRCLK) */
+/* Write bit-clock of I2S (in multiples of LRCLK) */
 static inline void set_bfs(struct i2s_dai *i2s, unsigned bfs)
 {
 	struct samsung_i2s_priv *priv = i2s->priv;
@@ -383,7 +383,7 @@  static inline void set_bfs(struct i2s_dai *i2s, unsigned bfs)
 	writel(mod, priv->addr + I2SMOD);
 }
 
-/* Sample-Size */
+/* Sample size */
 static inline int get_blc(struct i2s_dai *i2s)
 {
 	int blc = readl(i2s->priv->addr + I2SMOD);
@@ -397,7 +397,7 @@  static inline int get_blc(struct i2s_dai *i2s)
 	}
 }
 
-/* TX Channel Control */
+/* TX channel control */
 static void i2s_txctrl(struct i2s_dai *i2s, int on)
 {
 	struct samsung_i2s_priv *priv = i2s->priv;
@@ -742,7 +742,7 @@  static int i2s_hw_params(struct snd_pcm_substream *substream,
 	switch (params_channels(params)) {
 	case 6:
 		val |= MOD_DC2_EN;
-		/* fall through */
+		/* Fall through */
 	case 4:
 		val |= MOD_DC1_EN;
 		break;
@@ -821,7 +821,7 @@  static int i2s_hw_params(struct snd_pcm_substream *substream,
 	return 0;
 }
 
-/* We set constraints on the substream acc to the version of I2S */
+/* We set constraints on the substream according to the version of I2S */
 static int i2s_startup(struct snd_pcm_substream *substream,
 	  struct snd_soc_dai *dai)
 {
@@ -1056,7 +1056,8 @@  static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
 
 	pm_runtime_get_sync(dai->dev);
 
-	if (is_secondary(i2s)) { /* If this is probe on the secondary DAI */
+	if (is_secondary(i2s)) {
+		/* If this is probe on the secondary DAI */
 		snd_soc_dai_init_dma_data(dai, &i2s->dma_playback, NULL);
 	} else {
 		snd_soc_dai_init_dma_data(dai, &i2s->dma_playback,