From: Markus Pargmann <mpa@pengutronix.de> To: Mark Brown <broonie@kernel.org> Cc: Fabio Estevam <fabio.estevam@freescale.com>, alsa-devel@alsa-project.org, Alexander Shiyan <shc_work@mail.ru>, Sascha Hauer <s.hauer@pengutronix.de>, Timur Tabi <timur@tabi.org>, "Li.Xiubo@freescale.com" <Li.Xiubo@freescale.com>, kernel@pengutronix.de, Nicolin Chen <Guangyu.Chen@freescale.com>, Markus Pargmann <mpa@pengutronix.de>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 4/8] ASoC: fsl-ssi: remove unnecessary spinlock Date: Tue, 27 May 2014 10:24:21 +0200 [thread overview] Message-ID: <1401179065-31195-5-git-send-email-mpa@pengutronix.de> (raw) In-Reply-To: <1401179065-31195-1-git-send-email-mpa@pengutronix.de> From: Sascha Hauer <s.hauer@pengutronix.de> The baudclock_locked variable is only used in functions which are serialized anyway from the core. No need to have a lock around the variable, so remove it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Tested-By: Michael Grzeschik <mgr@pengutronix.de> --- sound/soc/fsl/fsl_ssi.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 930095b..b3033d9 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -163,7 +163,6 @@ struct fsl_ssi_private { bool baudclk_locked; bool use_dual_fifo; u8 i2s_mode; - spinlock_t baudclk_lock; struct clk *baudclk; struct clk *clk; unsigned int bitclk_freq; @@ -495,13 +494,9 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(rtd->cpu_dai); - unsigned long flags; - if (!dai->active && !fsl_ssi_is_ac97(ssi_private)) { - spin_lock_irqsave(&ssi_private->baudclk_lock, flags); + if (!dai->active && !fsl_ssi_is_ac97(ssi_private)) ssi_private->baudclk_locked = false; - spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags); - } /* When using dual fifo mode, it is safer to ensure an even period * size. If appearing to an odd number while DMA always starts its @@ -532,7 +527,7 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, struct ccsr_ssi __iomem *ssi = ssi_private->ssi; int synchronous = ssi_private->cpu_dai_drv.symmetric_rates, ret; u32 pm = 999, div2, psr, stccr, mask, afreq, factor, i; - unsigned long flags, clkrate, baudrate, tmprate; + unsigned long clkrate, baudrate, tmprate; u64 sub, savesub = 100000; unsigned int freq; @@ -603,18 +598,14 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, else write_ssi_mask(&ssi->srccr, mask, stccr); - spin_lock_irqsave(&ssi_private->baudclk_lock, flags); if (!ssi_private->baudclk_locked) { ret = clk_set_rate(ssi_private->baudclk, baudrate); if (ret) { - spin_unlock_irqrestore(&ssi_private->baudclk_lock, - flags); dev_err(cpu_dai->dev, "failed to set baudclk rate\n"); return -EINVAL; } ssi_private->baudclk_locked = true; } - spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags); return 0; } @@ -899,7 +890,6 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(rtd->cpu_dai); struct ccsr_ssi __iomem *ssi = ssi_private->ssi; - unsigned long flags; switch (cmd) { case SNDRV_PCM_TRIGGER_START: @@ -920,11 +910,9 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd, fsl_ssi_rx_config(ssi_private, false); if (!fsl_ssi_is_ac97(ssi_private) && (read_ssi(&ssi->scr) & - (CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE)) == 0) { - spin_lock_irqsave(&ssi_private->baudclk_lock, flags); + (CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE)) == 0) ssi_private->baudclk_locked = false; - spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags); - } + break; default: @@ -1257,7 +1245,6 @@ static int fsl_ssi_probe(struct platform_device *pdev) ssi_private->fifo_depth = 8; ssi_private->baudclk_locked = false; - spin_lock_init(&ssi_private->baudclk_lock); dev_set_drvdata(&pdev->dev, ssi_private); -- 2.0.0.rc2
WARNING: multiple messages have this Message-ID (diff)
From: mpa@pengutronix.de (Markus Pargmann) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 4/8] ASoC: fsl-ssi: remove unnecessary spinlock Date: Tue, 27 May 2014 10:24:21 +0200 [thread overview] Message-ID: <1401179065-31195-5-git-send-email-mpa@pengutronix.de> (raw) In-Reply-To: <1401179065-31195-1-git-send-email-mpa@pengutronix.de> From: Sascha Hauer <s.hauer@pengutronix.de> The baudclock_locked variable is only used in functions which are serialized anyway from the core. No need to have a lock around the variable, so remove it. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Tested-By: Michael Grzeschik <mgr@pengutronix.de> --- sound/soc/fsl/fsl_ssi.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 930095b..b3033d9 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -163,7 +163,6 @@ struct fsl_ssi_private { bool baudclk_locked; bool use_dual_fifo; u8 i2s_mode; - spinlock_t baudclk_lock; struct clk *baudclk; struct clk *clk; unsigned int bitclk_freq; @@ -495,13 +494,9 @@ static int fsl_ssi_startup(struct snd_pcm_substream *substream, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(rtd->cpu_dai); - unsigned long flags; - if (!dai->active && !fsl_ssi_is_ac97(ssi_private)) { - spin_lock_irqsave(&ssi_private->baudclk_lock, flags); + if (!dai->active && !fsl_ssi_is_ac97(ssi_private)) ssi_private->baudclk_locked = false; - spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags); - } /* When using dual fifo mode, it is safer to ensure an even period * size. If appearing to an odd number while DMA always starts its @@ -532,7 +527,7 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, struct ccsr_ssi __iomem *ssi = ssi_private->ssi; int synchronous = ssi_private->cpu_dai_drv.symmetric_rates, ret; u32 pm = 999, div2, psr, stccr, mask, afreq, factor, i; - unsigned long flags, clkrate, baudrate, tmprate; + unsigned long clkrate, baudrate, tmprate; u64 sub, savesub = 100000; unsigned int freq; @@ -603,18 +598,14 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, else write_ssi_mask(&ssi->srccr, mask, stccr); - spin_lock_irqsave(&ssi_private->baudclk_lock, flags); if (!ssi_private->baudclk_locked) { ret = clk_set_rate(ssi_private->baudclk, baudrate); if (ret) { - spin_unlock_irqrestore(&ssi_private->baudclk_lock, - flags); dev_err(cpu_dai->dev, "failed to set baudclk rate\n"); return -EINVAL; } ssi_private->baudclk_locked = true; } - spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags); return 0; } @@ -899,7 +890,6 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_pcm_runtime *rtd = substream->private_data; struct fsl_ssi_private *ssi_private = snd_soc_dai_get_drvdata(rtd->cpu_dai); struct ccsr_ssi __iomem *ssi = ssi_private->ssi; - unsigned long flags; switch (cmd) { case SNDRV_PCM_TRIGGER_START: @@ -920,11 +910,9 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd, fsl_ssi_rx_config(ssi_private, false); if (!fsl_ssi_is_ac97(ssi_private) && (read_ssi(&ssi->scr) & - (CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE)) == 0) { - spin_lock_irqsave(&ssi_private->baudclk_lock, flags); + (CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE)) == 0) ssi_private->baudclk_locked = false; - spin_unlock_irqrestore(&ssi_private->baudclk_lock, flags); - } + break; default: @@ -1257,7 +1245,6 @@ static int fsl_ssi_probe(struct platform_device *pdev) ssi_private->fifo_depth = 8; ssi_private->baudclk_locked = false; - spin_lock_init(&ssi_private->baudclk_lock); dev_set_drvdata(&pdev->dev, ssi_private); -- 2.0.0.rc2
next prev parent reply other threads:[~2014-05-27 8:24 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-05-27 8:24 [PATCH v5 0/8] ASoC: fsl-ssi: Driver cleanup Markus Pargmann 2014-05-27 8:24 ` Markus Pargmann 2014-05-27 8:24 ` [PATCH v5 1/8] ASoC: fsl-ssi: introduce SoC specific data Markus Pargmann 2014-05-27 8:24 ` Markus Pargmann 2014-05-27 8:24 ` [PATCH v5 2/8] ASoC: fsl-ssi: make fsl,mode property optional Markus Pargmann 2014-05-27 8:24 ` Markus Pargmann 2014-05-27 8:24 ` [PATCH v5 3/8] ASoC: fsl-ssi: set bitclock in master mode from hw_params Markus Pargmann 2014-05-27 8:24 ` Markus Pargmann 2014-05-27 8:24 ` Markus Pargmann [this message] 2014-05-27 8:24 ` [PATCH v5 4/8] ASoC: fsl-ssi: remove unnecessary spinlock Markus Pargmann 2014-05-27 8:24 ` [PATCH v5 5/8] ASoC: fsl-ssi: Set framerate divider correctly for i2s master mode Markus Pargmann 2014-05-27 8:24 ` Markus Pargmann 2014-05-27 8:24 ` [PATCH v5 6/8] ASoC: fsl-ssi: Fix baudclock handling Markus Pargmann 2014-05-27 8:24 ` Markus Pargmann 2014-05-27 8:24 ` [PATCH v5 7/8] ASoC: fsl-ssi: reorder and document fsl_ssi_private Markus Pargmann 2014-05-27 8:24 ` Markus Pargmann 2014-05-27 8:24 ` [PATCH v5 8/8] ASoC: fsl-ssi: Use regmap Markus Pargmann 2014-05-27 8:24 ` Markus Pargmann 2014-06-01 10:55 ` [PATCH v5 0/8] ASoC: fsl-ssi: Driver cleanup Mark Brown 2014-06-01 10:55 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1401179065-31195-5-git-send-email-mpa@pengutronix.de \ --to=mpa@pengutronix.de \ --cc=Guangyu.Chen@freescale.com \ --cc=Li.Xiubo@freescale.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=fabio.estevam@freescale.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=s.hauer@pengutronix.de \ --cc=shc_work@mail.ru \ --cc=timur@tabi.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.