[PATCH 0/8] ASoC: fix W=1 warnings for various SOCs
One more series of trivial fixes for atmel, samsung, qualcomm, sunxi, tegra, uniphier.
Pierre-Louis Bossart (8): ASoC: atmel: fix kernel-doc ASoC: samsung: spdif: fix kernel-doc ASoC: samsung: pcm: fix kernel-doc ASoC: qcom: q6asm: fix kernel-doc ASoC: sunxi: sun4i-i2s: fix kernel-doc ASoC: sunxi: sun4i-spdif: fix kernel-doc ASoC: tegra: tegra20_das: remove always-true comparison ASoC: uniphier: aio-core: fix kernel-doc
sound/soc/atmel/atmel-pcm-dma.c | 2 +- sound/soc/atmel/atmel_ssc_dai.c | 1 + sound/soc/qcom/qdsp6/q6asm.c | 2 +- sound/soc/samsung/pcm.c | 5 +++++ sound/soc/samsung/spdif.c | 6 +++--- sound/soc/sunxi/sun4i-i2s.c | 10 +++++++++- sound/soc/sunxi/sun4i-spdif.c | 2 +- sound/soc/tegra/tegra20_das.c | 3 +-- sound/soc/uniphier/aio-core.c | 7 +++---- 9 files changed, 25 insertions(+), 13 deletions(-)
Fix W=1 warning
Kernel-doc is not used in one file and missing argument in the second.
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- sound/soc/atmel/atmel-pcm-dma.c | 2 +- sound/soc/atmel/atmel_ssc_dai.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c index cb03c4f7324c..0a2e956232af 100644 --- a/sound/soc/atmel/atmel-pcm-dma.c +++ b/sound/soc/atmel/atmel-pcm-dma.c @@ -44,7 +44,7 @@ static const struct snd_pcm_hardware atmel_pcm_dma_hardware = { .buffer_bytes_max = 512 * 1024, };
-/** +/* * atmel_pcm_dma_irq: SSC interrupt handler for DMAENGINE enabled SSC * * We use DMAENGINE to send/receive data to/from SSC so this ISR is only to diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 0f18dfb85bfe..6a63e8797a0b 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -887,6 +887,7 @@ static int asoc_ssc_init(struct device *dev)
/** * atmel_ssc_set_audio - Allocate the specified SSC for audio use. + * @ssc_id: SSD ID in [0, NUM_SSC_DEVICES[ */ int atmel_ssc_set_audio(int ssc_id) {
On 02/07/2020 11:58:54-0500, Pierre-Louis Bossart wrote:
Fix W=1 warning
Kernel-doc is not used in one file and missing argument in the second.
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
Acked-by: Alexandre Belloni alexandre.belloni@bootlin.com
sound/soc/atmel/atmel-pcm-dma.c | 2 +- sound/soc/atmel/atmel_ssc_dai.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c index cb03c4f7324c..0a2e956232af 100644 --- a/sound/soc/atmel/atmel-pcm-dma.c +++ b/sound/soc/atmel/atmel-pcm-dma.c @@ -44,7 +44,7 @@ static const struct snd_pcm_hardware atmel_pcm_dma_hardware = { .buffer_bytes_max = 512 * 1024, };
-/** +/*
- atmel_pcm_dma_irq: SSC interrupt handler for DMAENGINE enabled SSC
- We use DMAENGINE to send/receive data to/from SSC so this ISR is only to
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index 0f18dfb85bfe..6a63e8797a0b 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -887,6 +887,7 @@ static int asoc_ssc_init(struct device *dev)
/**
- atmel_ssc_set_audio - Allocate the specified SSC for audio use.
*/
- @ssc_id: SSD ID in [0, NUM_SSC_DEVICES[
int atmel_ssc_set_audio(int ssc_id) { -- 2.25.1
Fix W=1 warnings - typos with structure fields
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- sound/soc/samsung/spdif.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 759fc6644329..4ae7ff623b82 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c @@ -70,9 +70,9 @@ * @clk_rate: Current clock rate for calcurate ratio. * @pclk: The peri-clock pointer for spdif master operation. * @sclk: The source clock pointer for making sync signals. - * @save_clkcon: Backup clkcon reg. in suspend. - * @save_con: Backup con reg. in suspend. - * @save_cstas: Backup cstas reg. in suspend. + * @saved_clkcon: Backup clkcon reg. in suspend. + * @saved_con: Backup con reg. in suspend. + * @saved_cstas: Backup cstas reg. in suspend. * @dma_playback: DMA information for playback channel. */ struct samsung_spdif_info {
On 02.07.2020 18:58, Pierre-Louis Bossart wrote:
Fix W=1 warnings - typos with structure fields
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
Reviewed-by: Sylwester Nawrocki s.nawrocki@samsung.com
Fix W=1 warnings - missing fields in structure
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- sound/soc/samsung/pcm.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index a5b1a12b3496..86eefbc89e9e 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -104,8 +104,13 @@
/** * struct s3c_pcm_info - S3C PCM Controller information + * @lock: Spin lock * @dev: The parent device passed to use from the probe. * @regs: The pointer to the device register block. + * @sclk_per_fs: number of sclk per frame sync + * @idleclk: Whether to keep PCMSCLK enabled even when idle(no active xfer) + * @pclk: the pclk pointer + * @cclk: the clck pointer * @dma_playback: DMA information for playback channel. * @dma_capture: DMA information for capture channel. */
On 02.07.2020 18:58, Pierre-Louis Bossart wrote:
Fix W=1 warnings - missing fields in structure
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
sound/soc/samsung/pcm.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index a5b1a12b3496..86eefbc89e9e 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -104,8 +104,13 @@
Thank you for the patch, I have some suggestions to improve the comments.
/**
- struct s3c_pcm_info - S3C PCM Controller information
- @lock: Spin lock
@lock: Spin lock to serialize access to the device registers and @idle_clk
- @dev: The parent device passed to use from the probe.
- @regs: The pointer to the device register block.
- @sclk_per_fs: number of sclk per frame sync
- @idleclk: Whether to keep PCMSCLK enabled even when idle(no active xfer)
How about adding space before the opening parenthesis?
- @pclk: the pclk pointer
@pclk: the PCLK_PCM (pcm) clock pointer
- @cclk: the clck pointer
@cclk: the SCLK_AUDIO (audio-bus) clock pointer
- @dma_playback: DMA information for playback channel.
- @dma_capture: DMA information for capture channel.
*/
With above changes feel free to add: Reviewed-by: Sylwester Nawrocki s.nawrocki@samsung.com
On 7/3/20 1:47 PM, Sylwester Nawrocki wrote:
On 02.07.2020 18:58, Pierre-Louis Bossart wrote:
Fix W=1 warnings - missing fields in structure
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
sound/soc/samsung/pcm.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index a5b1a12b3496..86eefbc89e9e 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -104,8 +104,13 @@
Thank you for the patch, I have some suggestions to improve the comments.
/**
- struct s3c_pcm_info - S3C PCM Controller information
- @lock: Spin lock
@lock: Spin lock to serialize access to the device registers and @idle_clk
- @dev: The parent device passed to use from the probe.
- @regs: The pointer to the device register block.
- @sclk_per_fs: number of sclk per frame sync
- @idleclk: Whether to keep PCMSCLK enabled even when idle(no active xfer)
How about adding space before the opening parenthesis?
- @pclk: the pclk pointer
@pclk: the PCLK_PCM (pcm) clock pointer
- @cclk: the clck pointer
@cclk: the SCLK_AUDIO (audio-bus) clock pointer
- @dma_playback: DMA information for playback channel.
- @dma_capture: DMA information for capture channel.
*/
With above changes feel free to add: Reviewed-by: Sylwester Nawrocki s.nawrocki@samsung.com
I wasn't really happy with the lame comments I added for pclk and cclk, thanks for suggesting a better wording. Will fix in a v2.
Fix W=1 warning - missing parameter description
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- sound/soc/qcom/qdsp6/q6asm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c index ae4b2cabdf2d..d67b23a5f397 100644 --- a/sound/soc/qcom/qdsp6/q6asm.c +++ b/sound/soc/qcom/qdsp6/q6asm.c @@ -912,9 +912,9 @@ static int q6asm_ac_send_cmd_sync(struct audio_client *ac, struct apr_pkt *pkt)
/** * q6asm_open_write() - Open audio client for writing - * * @ac: audio client pointer * @format: audio sample format + * @codec_profile: compressed format profile * @bits_per_sample: bits per sample * * Return: Will be an negative value on error or zero on success
Fix W=1 warnings - missing fields in description
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- sound/soc/sunxi/sun4i-i2s.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index d0a8d5810c0a..f23ff29e7c1d 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -128,13 +128,21 @@ struct sun4i_i2s;
/** * struct sun4i_i2s_quirks - Differences between SoC variants. - * * @has_reset: SoC needs reset deasserted. * @reg_offset_txdata: offset of the tx fifo. * @sun4i_i2s_regmap: regmap config to use. * @field_clkdiv_mclk_en: regmap field to enable mclk output. * @field_fmt_wss: regmap field to set word select size. * @field_fmt_sr: regmap field to set sample resolution. + * @bclk_dividers: bit clock dividers array + * @num_bclk_dividers: number of bit clock dividers + * @mclk_dividers: mclk dividers array + * @num_mclk_dividers: number of mclk dividers + * @get_bclk_parent_rate: callback to get bclk parent rate + * @get_sr: callback to get sample resolution + * @get_wss: callback to get word select size + * @set_chan_cfg: callback to set channel configuration + * @set_fmt: callback to set format */ struct sun4i_i2s_quirks { bool has_reset;
Fix W=1 warning - typo in field description
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- sound/soc/sunxi/sun4i-spdif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index 86779a99df75..326dd45e39da 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -167,7 +167,7 @@ /** * struct sun4i_spdif_quirks - Differences between SoC variants. * - * @reg_dac_tx_data: TX FIFO offset for DMA config. + * @reg_dac_txdata: TX FIFO offset for DMA config. * @has_reset: SoC needs reset deasserted. * @val_fctl_ftx: TX FIFO flush bitmask. */
Fix W=1 warning:
sound/soc//tegra/tegra20_das.c:101:11: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits] 101 | if ((reg >= TEGRA20_DAS_DAP_CTRL_SEL) && | ^~
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- sound/soc/tegra/tegra20_das.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/soc/tegra/tegra20_das.c b/sound/soc/tegra/tegra20_das.c index 1070b2710d5e..79dba878d854 100644 --- a/sound/soc/tegra/tegra20_das.c +++ b/sound/soc/tegra/tegra20_das.c @@ -98,8 +98,7 @@ EXPORT_SYMBOL_GPL(tegra20_das_connect_dac_to_dap);
static bool tegra20_das_wr_rd_reg(struct device *dev, unsigned int reg) { - if ((reg >= TEGRA20_DAS_DAP_CTRL_SEL) && - (reg <= LAST_REG(DAP_CTRL_SEL))) + if (reg <= LAST_REG(DAP_CTRL_SEL)) return true; if ((reg >= TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL) && (reg <= LAST_REG(DAC_INPUT_DATA_CLK_SEL)))
On 02/07/2020 17:59, Pierre-Louis Bossart wrote:
Fix W=1 warning:
sound/soc//tegra/tegra20_das.c:101:11: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits] 101 | if ((reg >= TEGRA20_DAS_DAP_CTRL_SEL) && | ^~
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
sound/soc/tegra/tegra20_das.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/soc/tegra/tegra20_das.c b/sound/soc/tegra/tegra20_das.c index 1070b2710d5e..79dba878d854 100644 --- a/sound/soc/tegra/tegra20_das.c +++ b/sound/soc/tegra/tegra20_das.c @@ -98,8 +98,7 @@ EXPORT_SYMBOL_GPL(tegra20_das_connect_dac_to_dap);
static bool tegra20_das_wr_rd_reg(struct device *dev, unsigned int reg) {
- if ((reg >= TEGRA20_DAS_DAP_CTRL_SEL) &&
(reg <= LAST_REG(DAP_CTRL_SEL)))
- if (reg <= LAST_REG(DAP_CTRL_SEL)) return true; if ((reg >= TEGRA20_DAS_DAC_INPUT_DATA_CLK_SEL) && (reg <= LAST_REG(DAC_INPUT_DATA_CLK_SEL)))
Thanks!
Reviewed-by: Jon Hunter jonathanh@nvidia.com
Cheers Jon
Fix W=1 warning - wrong parameter description and bad format
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com --- sound/soc/uniphier/aio-core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sound/soc/uniphier/aio-core.c b/sound/soc/uniphier/aio-core.c index 9bcba06ba52e..b8195778953e 100644 --- a/sound/soc/uniphier/aio-core.c +++ b/sound/soc/uniphier/aio-core.c @@ -93,9 +93,9 @@ void aio_iecout_set_enable(struct uniphier_aio_chip *chip, bool enable)
/** * aio_chip_set_pll - set frequency to audio PLL - * @chip : the AIO chip pointer - * @source: PLL - * @freq : frequency in Hz, 0 is ignored + * @chip: the AIO chip pointer + * @pll_id: PLL + * @freq: frequency in Hz, 0 is ignored * * Sets frequency of audio PLL. This function can be called anytime, * but it takes time till PLL is locked. @@ -267,7 +267,6 @@ void aio_port_reset(struct uniphier_aio_sub *sub) /** * aio_port_set_ch - set channels of LPCM * @sub: the AIO substream pointer, PCM substream only - * @ch : count of channels * * Set suitable slot selecting to input/output port block of AIO. *
On Fri, Jul 3, 2020 at 1:59 AM Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com wrote:
Fix W=1 warning - wrong parameter description and bad format
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
Reviewed-by: Masahiro Yamada yamada.masahiro@socionext.com
sound/soc/uniphier/aio-core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/sound/soc/uniphier/aio-core.c b/sound/soc/uniphier/aio-core.c index 9bcba06ba52e..b8195778953e 100644 --- a/sound/soc/uniphier/aio-core.c +++ b/sound/soc/uniphier/aio-core.c @@ -93,9 +93,9 @@ void aio_iecout_set_enable(struct uniphier_aio_chip *chip, bool enable)
/**
- aio_chip_set_pll - set frequency to audio PLL
- @chip : the AIO chip pointer
- @source: PLL
- @freq : frequency in Hz, 0 is ignored
- @chip: the AIO chip pointer
- @pll_id: PLL
- @freq: frequency in Hz, 0 is ignored
- Sets frequency of audio PLL. This function can be called anytime,
- but it takes time till PLL is locked.
@@ -267,7 +267,6 @@ void aio_port_reset(struct uniphier_aio_sub *sub) /**
- aio_port_set_ch - set channels of LPCM
- @sub: the AIO substream pointer, PCM substream only
- @ch : count of channels
- Set suitable slot selecting to input/output port block of AIO.
-- 2.25.1
participants (5)
-
Alexandre Belloni
-
Jon Hunter
-
Masahiro Yamada
-
Pierre-Louis Bossart
-
Sylwester Nawrocki