February 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC: ux500: Remove unuseful break after return
by Codrut Grosu 25 Feb '17

25 Feb '17

This was reported by checkpatch.pl Signed-off-by: Codrut GROSU <codrut.cristian.grosu(a)gmail.com> --- sound/soc/ux500/ux500_msp_i2s.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index 959d7b4..bd5266a 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -604,7 +604,6 @@ int ux500_msp_i2s_trigger(struct ux500_msp *msp, int cmd, int direction) break; default: return -EINVAL; - break; } return 0; -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: tegra: Remove unnecessary 'Block comments should align the * on each line' message
by Codrut Grosu 25 Feb '17

25 Feb '17

This was reported by checkpatch.pl Signed-off-by: Codrut Grosu <codrut.cristian.grosu(a)gmail.com> --- sound/soc/tegra/tegra_alc5632.c | 2 +- sound/soc/tegra/tegra_rt5640.c | 2 +- sound/soc/tegra/tegra_rt5677.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index 0509902..1f648f9 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -1,5 +1,5 @@ /* -* tegra_alc5632.c -- Toshiba AC100(PAZ00) machine ASoC driver + * tegra_alc5632.c -- Toshiba AC100(PAZ00) machine ASoC driver * * Copyright (C) 2011 The AC100 Kernel Team <ac100(a)lists.lauchpad.net> * Copyright (C) 2012 - NVIDIA, Inc. diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index 93a3568..cf706d0 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -1,5 +1,5 @@ /* -* tegra_rt5640.c - Tegra machine ASoC driver for boards using RT5640 codec. + * tegra_rt5640.c - Tegra machine ASoC driver for boards using RT5640 codec. * * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. * diff --git a/sound/soc/tegra/tegra_rt5677.c b/sound/soc/tegra/tegra_rt5677.c index ebf58d0..0ed2eca 100644 --- a/sound/soc/tegra/tegra_rt5677.c +++ b/sound/soc/tegra/tegra_rt5677.c @@ -1,5 +1,5 @@ /* -* tegra_rt5677.c - Tegra machine ASoC driver for boards using RT5677 codec. + * tegra_rt5677.c - Tegra machine ASoC driver for boards using RT5677 codec. * * Copyright (c) 2014, The Chromium OS Authors. All rights reserved. * 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: kirkwood: Add a blank line after declarations
by Anda-Alexandra Dorneanu 25 Feb '17

25 Feb '17

From: andadrn <andadrn(a)gmail.com> This was reported by checkpatch.pl Signed-off-by: Anda-Alexandra Dorneanu <andadrn(a)gmail.com> --- sound/soc/kirkwood/kirkwood-dma.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c index dafd22e..0af5d46 100644 --- a/sound/soc/kirkwood/kirkwood-dma.c +++ b/sound/soc/kirkwood/kirkwood-dma.c @@ -24,6 +24,7 @@ static struct kirkwood_dma_data *kirkwood_priv(struct snd_pcm_substream *subs) { struct snd_soc_pcm_runtime *soc_runtime = subs->private_data; + return snd_soc_dai_get_drvdata(soc_runtime->cpu_dai); } @@ -91,6 +92,7 @@ static irqreturn_t kirkwood_dma_irq(int irq, void *dev_id) /* try to find matching cs for current dma address */ for (i = 0; i < dram->num_cs; i++) { const struct mbus_dram_window *cs = dram->cs + i; + if ((cs->base & 0xffff0000) < (dma & 0xffff0000)) { writel(cs->base & 0xffff0000, base + KIRKWOOD_AUDIO_WIN_BASE_REG(win)); -- 1.9.1

2 1

[alsa-devel] [PATCH] davinci: davinci-evm: Put spaces before '='
by sergiu.weisz 25 Feb '17

25 Feb '17

This was reported by checkpatch.pl Signed-off-by: sergiu.weisz <sergiu121(a)gmail.com> --- sound/soc/davinci/davinci-evm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 7a369e0..c5d80e8 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -195,7 +195,7 @@ static struct snd_soc_dai_link dm6467_evm_dai[] = { { .name = "TLV320AIC3X", .stream_name = "AIC3X", - .cpu_dai_name= "davinci-mcasp.0", + .cpu_dai_name = "davinci-mcasp.0", .codec_dai_name = "tlv320aic3x-hifi", .platform_name = "davinci-mcasp.0", .codec_name = "tlv320aic3x-codec.0-001a", @@ -207,7 +207,7 @@ static struct snd_soc_dai_link dm6467_evm_dai[] = { { .name = "McASP", .stream_name = "spdif", - .cpu_dai_name= "davinci-mcasp.1", + .cpu_dai_name = "davinci-mcasp.1", .codec_dai_name = "dit-hifi", .codec_name = "spdif_dit", .platform_name = "davinci-mcasp.1", @@ -232,7 +232,7 @@ static struct snd_soc_dai_link da830_evm_dai = { static struct snd_soc_dai_link da850_evm_dai = { .name = "TLV320AIC3X", .stream_name = "AIC3X", - .cpu_dai_name= "davinci-mcasp.0", + .cpu_dai_name = "davinci-mcasp.0", .codec_dai_name = "tlv320aic3x-hifi", .codec_name = "tlv320aic3x-codec.1-0018", .platform_name = "davinci-mcasp.0", -- 2.9.3

1 0

[alsa-devel] [PATCH] ASoC: sun4i-codec: Remove spaces before tabs.
by Codrut Grosu 25 Feb '17

25 Feb '17

This was reported by checkpatch.pl Signed-off-by: Codrut GROSU <codrut.cristian.grosu(a)gmail.com> --- sound/soc/sunxi/sun4i-codec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index c3aab10..7ba6849 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -1139,8 +1139,8 @@ static int sun4i_codec_dai_probe(struct snd_soc_dai *dai) .stream_name = "Capture", .channels_min = 1, .channels_max = 2, - .rates = SUN4I_CODEC_RATES, - .formats = SUN4I_CODEC_FORMATS, + .rates = SUN4I_CODEC_RATES, + .formats = SUN4I_CODEC_FORMATS, .sig_bits = 24, }, }; -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: mxs-saif: Removing whitespace before a pointer and its name
by Camelia Moise 25 Feb '17

25 Feb '17

Signed-off-by: Camelia Moise <camelia.moise21(a)gmail.com> --- sound/soc/mxs/mxs-saif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index b42f301..729249a 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -78,7 +78,7 @@ static int mxs_saif_set_dai_sysclk(struct snd_soc_dai *cpu_dai, * from its master_id. * Note that the master could be itself. */ -static inline struct mxs_saif *mxs_saif_get_master(struct mxs_saif * saif) +static inline struct mxs_saif *mxs_saif_get_master(struct mxs_saif *saif) { return mxs_saif[saif->master_id]; } -- 2.7.4

1 0

[alsa-devel] [PATCH] soc: xtensa: Replace "unsigned" with "unsigned int"
by Corina Palade 25 Feb '17

25 Feb '17

This was reported by checkpatch.pl. Signed-off-by: Corina Palade <corina.palade103(a)gmail.com> --- sound/soc/xtensa/xtfpga-i2s.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sound/soc/xtensa/xtfpga-i2s.c b/sound/soc/xtensa/xtfpga-i2s.c index 8382ffa..01a2622 100644 --- a/sound/soc/xtensa/xtfpga-i2s.c +++ b/sound/soc/xtensa/xtfpga-i2s.c @@ -76,22 +76,22 @@ struct xtfpga_i2s { * handler by means of synchronize_rcu call. */ struct snd_pcm_substream __rcu *tx_substream; - unsigned (*tx_fn)(struct xtfpga_i2s *i2s, + unsigned int (*tx_fn)(struct xtfpga_i2s *i2s, struct snd_pcm_runtime *runtime, - unsigned tx_ptr); - unsigned tx_ptr; /* next frame index in the sample buffer */ + unsigned int tx_ptr); + unsigned int tx_ptr; /* next frame index in the sample buffer */ /* current fifo level estimate. * Doesn't have to be perfectly accurate, but must be not less than * the actual FIFO level in order to avoid stall on push attempt. */ - unsigned tx_fifo_level; + unsigned int tx_fifo_level; /* FIFO level at which level interrupt occurs */ - unsigned tx_fifo_low; + unsigned int tx_fifo_low; /* maximal FIFO level */ - unsigned tx_fifo_high; + unsigned int tx_fifo_high; }; static bool xtfpga_i2s_wr_reg(struct device *dev, unsigned int reg) @@ -130,9 +130,9 @@ static const struct regmap_config xtfpga_i2s_regmap_config = { * the LSB of each word is used. */ #define xtfpga_pcm_tx_fn(channels, sample_bits) \ -static unsigned xtfpga_pcm_tx_##channels##x##sample_bits( \ +static unsigned int xtfpga_pcm_tx_##channels##x##sample_bits( \ struct xtfpga_i2s *i2s, struct snd_pcm_runtime *runtime, \ - unsigned tx_ptr) \ + unsigned int tx_ptr) \ { \ const u##sample_bits (*p)[channels] = \ (void *)runtime->dma_area; \ @@ -165,8 +165,8 @@ static bool xtfpga_pcm_push_tx(struct xtfpga_i2s *i2s) tx_substream = rcu_dereference(i2s->tx_substream); tx_active = tx_substream && snd_pcm_running(tx_substream); if (tx_active) { - unsigned tx_ptr = ACCESS_ONCE(i2s->tx_ptr); - unsigned new_tx_ptr = i2s->tx_fn(i2s, tx_substream->runtime, + unsigned int tx_ptr = ACCESS_ONCE(i2s->tx_ptr); + unsigned int new_tx_ptr = i2s->tx_fn(i2s, tx_substream->runtime, tx_ptr); cmpxchg(&i2s->tx_ptr, tx_ptr, new_tx_ptr); @@ -178,8 +178,8 @@ static bool xtfpga_pcm_push_tx(struct xtfpga_i2s *i2s) static void xtfpga_pcm_refill_fifo(struct xtfpga_i2s *i2s) { - unsigned int_status; - unsigned i; + unsigned int int_status; + unsigned int i; regmap_read(i2s->regmap, XTFPGA_I2S_INT_STATUS, &int_status); @@ -227,7 +227,7 @@ static irqreturn_t xtfpga_i2s_threaded_irq_handler(int irq, void *dev_id) { struct xtfpga_i2s *i2s = dev_id; struct snd_pcm_substream *tx_substream; - unsigned config, int_status, int_mask; + unsigned int config, int_status, int_mask; regmap_read(i2s->regmap, XTFPGA_I2S_CONFIG, &config); regmap_read(i2s->regmap, XTFPGA_I2S_INT_MASK, &int_mask); @@ -284,11 +284,11 @@ static int xtfpga_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { struct xtfpga_i2s *i2s = snd_soc_dai_get_drvdata(dai); - unsigned srate = params_rate(params); - unsigned channels = params_channels(params); - unsigned period_size = params_period_size(params); - unsigned sample_size = snd_pcm_format_width(params_format(params)); - unsigned freq, ratio, level; + unsigned int srate = params_rate(params); + unsigned int channels = params_channels(params); + unsigned int period_size = params_period_size(params); + unsigned int sample_size = snd_pcm_format_width(params_format(params)); + unsigned int freq, ratio, level; int err; regmap_update_bits(i2s->regmap, XTFPGA_I2S_CONFIG, @@ -393,7 +393,7 @@ static int xtfpga_pcm_hw_params(struct snd_pcm_substream *substream, int ret; struct snd_pcm_runtime *runtime = substream->runtime; struct xtfpga_i2s *i2s = runtime->private_data; - unsigned channels = params_channels(hw_params); + unsigned int channels = params_channels(hw_params); switch (channels) { case 1: -- 2.7.4

1 0

[alsa-devel] [PATCH] soc: atmel: Add line after declaration.
by Banu Calin 25 Feb '17

25 Feb '17

This was reported by checkpatch.pl Signed-off-by: Banu Calin <banucaliniulian(a)gmail.com> --- sound/atmel/ac97c.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index 6dad042..4a0a48e 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -95,12 +95,14 @@ struct atmel_ac97c { static void atmel_ac97c_dma_playback_period_done(void *arg) { struct atmel_ac97c *chip = arg; + snd_pcm_period_elapsed(chip->playback_substream); } static void atmel_ac97c_dma_capture_period_done(void *arg) { struct atmel_ac97c *chip = arg; + snd_pcm_period_elapsed(chip->capture_substream); } @@ -297,6 +299,7 @@ static int atmel_ac97c_capture_hw_params(struct snd_pcm_substream *substream, static int atmel_ac97c_playback_hw_free(struct snd_pcm_substream *substream) { struct atmel_ac97c *chip = snd_pcm_substream_chip(substream); + if (cpu_is_at32ap7000()) { if (test_and_clear_bit(DMA_TX_READY, &chip->flags)) dw_dma_cyclic_free(chip->dma.tx_chan); @@ -307,6 +310,7 @@ static int atmel_ac97c_playback_hw_free(struct snd_pcm_substream *substream) static int atmel_ac97c_capture_hw_free(struct snd_pcm_substream *substream) { struct atmel_ac97c *chip = snd_pcm_substream_chip(substream); + if (cpu_is_at32ap7000()) { if (test_and_clear_bit(DMA_RX_READY, &chip->flags)) dw_dma_cyclic_free(chip->dma.rx_chan); @@ -659,6 +663,7 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev) if (sr & AC97C_SR_CAEVT) { struct snd_pcm_runtime *runtime; int offset, next_period, block_size; + dev_dbg(&chip->pdev->dev, "channel A event%s%s%s%s%s%s\n", casr & AC97C_CSR_OVRUN ? " OVRUN" : "", casr & AC97C_CSR_RXRDY ? " RXRDY" : "", @@ -804,6 +809,7 @@ static int atmel_ac97c_pcm_new(struct atmel_ac97c *chip) static int atmel_ac97c_mixer_new(struct atmel_ac97c *chip) { struct snd_ac97_template template; + memset(&template, 0, sizeof(template)); template.private_data = chip; return snd_ac97_mixer(chip->ac97_bus, &template, &chip->ac97); -- 2.7.4

1 0

[alsa-devel] [PATCH] sound: soc: generic: Removed unnecessary blank line
by Andrei Hirgau 25 Feb '17

25 Feb '17

Reported by checkpatch.pl Signed-off-by: Andrei Hirgau <hirgauandrei(a)gmail.com> --- sound/soc/generic/simple-card.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 85b4f18..53bcf95 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -448,7 +448,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev) priv->snd_card.num_links = num; if (np && of_device_is_available(np)) { - ret = asoc_simple_card_parse_of(np, priv); if (ret < 0) { if (ret != -EPROBE_DEFER) -- 2.7.4

1 0

[alsa-devel] [PATCH] soc: blackfin: remove 'out of memory' message
by Mihai Burduselu 25 Feb '17

25 Feb '17

reported by checkpatch.pl Signed-off-by: Mihai Burduselu <michelcatalin(a)gmail.com> --- sound/soc/blackfin/bf5xx-sport.c | 8 ++------ sound/soc/blackfin/bf6xx-sport.c | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sound/soc/blackfin/bf5xx-sport.c b/sound/soc/blackfin/bf5xx-sport.c index 9dfa1241ea66..c445d6cc875e 100644 --- a/sound/soc/blackfin/bf5xx-sport.c +++ b/sound/soc/blackfin/bf5xx-sport.c @@ -876,10 +876,8 @@ struct sport_device *sport_init(struct platform_device *pdev, } sport = kzalloc(sizeof(*sport), GFP_KERNEL); - if (!sport) { - dev_err(dev, "failed to allocate for sport device\n"); + if (!sport) goto __init_err0; - } sport->num = param.num; sport->dma_rx_chan = param.dma_rx_chan; @@ -921,10 +919,8 @@ struct sport_device *sport_init(struct platform_device *pdev, sport->dummy_count = param.dummy_count; sport->private_data = kzalloc(priv_size, GFP_KERNEL); - if (!sport->private_data) { - dev_err(dev, "could not alloc priv data %zu bytes\n", priv_size); + if (!sport->private_data) goto __init_err4; - } if (L1_DATA_A_LENGTH) sport->dummy_buf = l1_data_sram_zalloc(param.dummy_count * 2); diff --git a/sound/soc/blackfin/bf6xx-sport.c b/sound/soc/blackfin/bf6xx-sport.c index dfb744381c42..b56ff75d4c13 100644 --- a/sound/soc/blackfin/bf6xx-sport.c +++ b/sound/soc/blackfin/bf6xx-sport.c @@ -388,10 +388,8 @@ struct sport_device *sport_create(struct platform_device *pdev) int ret; sport = kzalloc(sizeof(*sport), GFP_KERNEL); - if (!sport) { - dev_err(dev, "Unable to allocate memory for sport device\n"); + if (!sport) return NULL; - } sport->pdev = pdev; ret = sport_get_resource(sport); -- 2.11.0

1 0