mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
ASoC: mchp-spdiftx: use regmap_update_bits()
Use regmap_update_bits() instead of regmap_read(), running variable, regmap_write(). There is no need for extra variables and checks around it as regmap_update_bits() already does this. With this code becomes simpler. Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> Link: https://lore.kernel.org/r/20230301113807.24036-3-claudiu.beznea@microchip.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
28ce569845
commit
0ab4bd5bf2
1 changed files with 5 additions and 17 deletions
|
@ -306,15 +306,10 @@ static int mchp_spdiftx_trigger(struct snd_pcm_substream *substream, int cmd,
|
||||||
{
|
{
|
||||||
struct mchp_spdiftx_dev *dev = snd_soc_dai_get_drvdata(dai);
|
struct mchp_spdiftx_dev *dev = snd_soc_dai_get_drvdata(dai);
|
||||||
struct mchp_spdiftx_mixer_control *ctrl = &dev->control;
|
struct mchp_spdiftx_mixer_control *ctrl = &dev->control;
|
||||||
u32 mr;
|
|
||||||
int running;
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* do not start/stop while channel status or user data is updated */
|
/* do not start/stop while channel status or user data is updated */
|
||||||
spin_lock(&ctrl->lock);
|
spin_lock(&ctrl->lock);
|
||||||
regmap_read(dev->regmap, SPDIFTX_MR, &mr);
|
|
||||||
running = !!(mr & SPDIFTX_MR_TXEN_ENABLE);
|
|
||||||
|
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
case SNDRV_PCM_TRIGGER_RESUME:
|
case SNDRV_PCM_TRIGGER_RESUME:
|
||||||
case SNDRV_PCM_TRIGGER_START:
|
case SNDRV_PCM_TRIGGER_START:
|
||||||
|
@ -323,10 +318,8 @@ static int mchp_spdiftx_trigger(struct snd_pcm_substream *substream, int cmd,
|
||||||
dev->suspend_irq = 0;
|
dev->suspend_irq = 0;
|
||||||
fallthrough;
|
fallthrough;
|
||||||
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
|
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
|
||||||
if (!running) {
|
ret = regmap_update_bits(dev->regmap, SPDIFTX_MR, SPDIFTX_MR_TXEN_MASK,
|
||||||
mr &= ~SPDIFTX_MR_TXEN_MASK;
|
SPDIFTX_MR_TXEN_ENABLE);
|
||||||
mr |= SPDIFTX_MR_TXEN_ENABLE;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case SNDRV_PCM_TRIGGER_SUSPEND:
|
case SNDRV_PCM_TRIGGER_SUSPEND:
|
||||||
regmap_read(dev->regmap, SPDIFTX_IMR, &dev->suspend_irq);
|
regmap_read(dev->regmap, SPDIFTX_IMR, &dev->suspend_irq);
|
||||||
|
@ -336,17 +329,12 @@ static int mchp_spdiftx_trigger(struct snd_pcm_substream *substream, int cmd,
|
||||||
SPDIFTX_IR_TXUDR | SPDIFTX_IR_TXOVR);
|
SPDIFTX_IR_TXUDR | SPDIFTX_IR_TXOVR);
|
||||||
fallthrough;
|
fallthrough;
|
||||||
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
|
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
|
||||||
if (running) {
|
ret = regmap_update_bits(dev->regmap, SPDIFTX_MR, SPDIFTX_MR_TXEN_MASK,
|
||||||
mr &= ~SPDIFTX_MR_TXEN_MASK;
|
SPDIFTX_MR_TXEN_DISABLE);
|
||||||
mr |= SPDIFTX_MR_TXEN_DISABLE;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
spin_unlock(&ctrl->lock);
|
ret = -EINVAL;
|
||||||
return -EINVAL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = regmap_write(dev->regmap, SPDIFTX_MR, mr);
|
|
||||||
spin_unlock(&ctrl->lock);
|
spin_unlock(&ctrl->lock);
|
||||||
if (ret)
|
if (ret)
|
||||||
dev_err(dev->dev, "unable to disable TX: %d\n", ret);
|
dev_err(dev->dev, "unable to disable TX: %d\n", ret);
|
||||||
|
|
Loading…
Reference in a new issue