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

[alsa-devel] [PATCH] ASoC: sh: Remove redundant out of memory message
by Cristian Done 25 Feb '17

25 Feb '17

Signed-off-by: Cristian Done <done.cristian(a)gmail.com> --- sound/soc/sh/fsi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index ead520182e26..6793dc359114 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -1964,7 +1964,6 @@ static int fsi_probe(struct platform_device *pdev) master = devm_kzalloc(&pdev->dev, sizeof(*master), GFP_KERNEL); if (!master) { - dev_err(&pdev->dev, "Could not allocate master\n"); return -ENOMEM; } -- 2.11.0

2 1

[alsa-devel] [PATCH] ASoC: pxa: Added */ to the next line
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/pxa/hx4700.c | 3 ++- sound/soc/pxa/pxa-ssp.c | 3 ++- sound/soc/pxa/pxa2xx-pcm.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c index 8548304..17c2e67 100644 --- a/sound/soc/pxa/hx4700.c +++ b/sound/soc/pxa/hx4700.c @@ -70,7 +70,8 @@ static int hx4700_hw_params(struct snd_pcm_substream *substream, return ret; /* inform codec driver about clock freq * - * (PXA I2S always uses divider 256) */ + * (PXA I2S always uses divider 256) + */ ret = snd_soc_dai_set_sysclk(codec_dai, 0, 256 * params_rate(params), SND_SOC_CLOCK_IN); if (ret < 0) diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 3cad990..3bdace6 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -254,7 +254,8 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai, } /* The SSP clock must be disabled when changing SSP clock mode - * on PXA2xx. On PXA3xx it must be enabled when doing so. */ + * on PXA2xx. On PXA3xx it must be enabled when doing so. + */ if (ssp->type != PXA3xx_SSP) clk_disable_unprepare(ssp->clk); val = pxa_ssp_read_reg(ssp, SSCR0) | sscr0; diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index b51d7a0..3926cd8 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c @@ -31,7 +31,8 @@ static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream, dma = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream); /* return if this is a bufferless transfer e.g. - * codec <--> BT codec or GSM modem -- lg FIXME */ + * codec <--> BT codec or GSM modem -- lg + */ if (!dma) return 0; -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: pxa: Remove unneeded return statement in void function
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/pxa/mmp-pcm.c | 1 - sound/soc/pxa/mmp-sspa.c | 1 - 2 files changed, 2 deletions(-) diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c index 96df9b2..5b5f1a4 100644 --- a/sound/soc/pxa/mmp-pcm.c +++ b/sound/soc/pxa/mmp-pcm.c @@ -166,7 +166,6 @@ static void mmp_pcm_free_dma_buffers(struct snd_pcm *pcm) buf->area = NULL; } - return; } static int mmp_pcm_preallocate_dma_buffer(struct snd_pcm_substream *substream, diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c index ca8b23f..9cc3501 100644 --- a/sound/soc/pxa/mmp-sspa.c +++ b/sound/soc/pxa/mmp-sspa.c @@ -119,7 +119,6 @@ static void mmp_sspa_shutdown(struct snd_pcm_substream *substream, clk_disable(priv->sspa->clk); clk_disable(priv->sysclk); - return; } /* -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: pxa2xx-i2s: Remove unneeded init of static variable
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/pxa/pxa2xx-i2s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 3fb60ba..744edc6 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -80,7 +80,7 @@ struct pxa_i2s_port { }; static struct pxa_i2s_port pxa_i2s; static struct clk *clk_i2s; -static int clk_ena = 0; +static int clk_ena; static unsigned long pxa2xx_i2s_pcm_stereo_out_req = 3; static struct snd_dmaengine_dai_dma_data pxa2xx_i2s_pcm_stereo_out = { -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: pxa: 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/pxa/pxa2xx-i2s.c | 6 +++--- sound/soc/pxa/pxa2xx-pcm.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 27aa0e4..3fb60ba 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -46,10 +46,10 @@ #define SACR0_STRF (1 << 5) /* FIFO Select for EFWR Special Function */ #define SACR0_EFWR (1 << 4) /* Enable EFWR Function */ #define SACR0_RST (1 << 3) /* FIFO, i2s Register Reset */ -#define SACR0_BCKD (1 << 2) /* Bit Clock Direction */ +#define SACR0_BCKD (1 << 2) /* Bit Clock Direction */ #define SACR0_ENB (1 << 0) /* Enable I2S Link */ #define SACR1_ENLBF (1 << 5) /* Enable Loopback */ -#define SACR1_DRPL (1 << 4) /* Disable Replaying Function */ +#define SACR1_DRPL (1 << 4) /* Disable Replaying Function */ #define SACR1_DREC (1 << 3) /* Disable Recording Function */ #define SACR1_AMSL (1 << 0) /* Specify Alternate Mode */ @@ -60,7 +60,7 @@ #define SASR0_TFS (1 << 3) /* Tx FIFO Service Request */ #define SASR0_BSY (1 << 2) /* I2S Busy */ #define SASR0_RNE (1 << 1) /* Rx FIFO Not Empty */ -#define SASR0_TNF (1 << 0) /* Tx FIFO Not Empty */ +#define SASR0_TNF (1 << 0) /* Tx FIFO Not Empty */ #define SAICR_ROR (1 << 6) /* Clear Rx FIFO Overrun Interrupt */ #define SAICR_TUR (1 << 5) /* Clear Tx FIFO Underrun Interrupt */ diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c index 410d48b..b51d7a0 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c @@ -85,7 +85,7 @@ static int pxa2xx_soc_pcm_new(struct snd_soc_pcm_runtime *rtd) } static struct snd_soc_platform_driver pxa2xx_soc_platform = { - .ops = &pxa2xx_pcm_ops, + .ops = &pxa2xx_pcm_ops, .pcm_new = pxa2xx_soc_pcm_new, .pcm_free = pxa2xx_pcm_free_dma_buffers, }; -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: pxa: Add space around ':' and '('
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/pxa/pxa2xx-i2s.c | 2 +- sound/soc/pxa/tosa.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 0389cf7..27aa0e4 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -119,7 +119,7 @@ static int pxa_i2s_wait(void) int i; /* flush the Rx FIFO */ - for(i = 0; i < 16; i++) + for (i = 0; i < 16; i++) SADR; return 0; } diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index e022b2a..1812748 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c @@ -133,7 +133,7 @@ static int tosa_set_spk(struct snd_kcontrol *kcontrol, static int tosa_hp_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *k, int event) { - gpio_set_value(TOSA_GPIO_L_MUTE, SND_SOC_DAPM_EVENT_ON(event) ? 1 :0); + gpio_set_value(TOSA_GPIO_L_MUTE, SND_SOC_DAPM_EVENT_ON(event) ? 1 : 0); return 0; } -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: pxa: Remove space before semicolon
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/pxa/spitz.c | 4 ++-- sound/soc/pxa/z2.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index 07d77cd..d38a2b5 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -230,8 +230,8 @@ static int spitz_mic_bias(struct snd_soc_dapm_widget *w, {"Headset Jack", NULL, "ROUT1"}, /* ext speaker connected to LOUT2, ROUT2 */ - {"Ext Spk", NULL , "ROUT2"}, - {"Ext Spk", NULL , "LOUT2"}, + {"Ext Spk", NULL, "ROUT2"}, + {"Ext Spk", NULL, "LOUT2"}, /* mic is connected to input 1 - with bias */ {"LINPUT1", NULL, "Mic Bias"}, diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 990b1aa..6d88d9a 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -119,8 +119,8 @@ static int z2_hw_params(struct snd_pcm_substream *substream, {"Headphone Jack", NULL, "ROUT1"}, /* ext speaker connected to LOUT2, ROUT2 */ - {"Ext Spk", NULL , "ROUT2"}, - {"Ext Spk", NULL , "LOUT2"}, + {"Ext Spk", NULL, "ROUT2"}, + {"Ext Spk", NULL, "LOUT2"}, /* mic is connected to R input 2 - with bias */ {"RINPUT2", NULL, "Mic Bias"}, -- 1.9.1

1 0

[alsa-devel] [PATCH] SoC: nuc900: Remove space before semicolon
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/nuc900/nuc900-ac97.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index b6615af..1cacfb4 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -76,7 +76,7 @@ static unsigned short nuc900_ac97_read(struct snd_ac97 *ac97, goto out; } - val = AUDIO_READ(nuc900_audio->mmio + ACTL_ACOS0) ; + val = AUDIO_READ(nuc900_audio->mmio + ACTL_ACOS0); val &= ~SLOT1_VALID; AUDIO_WRITE(nuc900_audio->mmio + ACTL_ACOS0, val); -- 1.9.1

1 0

[alsa-devel] [PATCH] ASoC: ux500: Added blank line after declarations
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_dai.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c index 36e9bb2..ec5152a 100644 --- a/sound/soc/ux500/ux500_msp_dai.c +++ b/sound/soc/ux500/ux500_msp_dai.c @@ -133,6 +133,7 @@ static int setup_pcm_framing(struct snd_soc_dai *dai, unsigned int rate, struct ux500_msp_i2s_drvdata *drvdata = dev_get_drvdata(dai->dev); u32 frame_length = MSP_FRAME_LEN_1; + prot_desc->frame_width = 0; switch (drvdata->slots) { -- 1.9.1

1 0

[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