diff options
author | Mark Brown <broonie@kernel.org> | 2022-07-26 15:06:52 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2022-07-26 15:06:52 +0200 |
commit | fcc5b37cfd9e177d735af31a6e2938a8087ac854 (patch) | |
tree | 01e2af7f5ee7b7bdf97c4e52ef24836448bea50b /sound/soc/atmel/mchp-spdiftx.c | |
parent | ASoC: amd: acp: Fix initialization of ext_intr_stat1 in i2s_irq_handler() (diff) | |
parent | ASoC: mchp-spdiftx: add and remove black line around MODULE_DEVICE_TABLE() (diff) | |
download | linux-fcc5b37cfd9e177d735af31a6e2938a8087ac854.tar.xz linux-fcc5b37cfd9e177d735af31a6e2938a8087ac854.zip |
ASoC: atmel: one fix and few cleanups
Merge series from Claudiu Beznea <claudiu.beznea@microchip.com>:
The series adds one fix for mchp-spdifrx and few cleanups for
mchp-spdifrx and mchp-spdifrx drivers.
Diffstat (limited to 'sound/soc/atmel/mchp-spdiftx.c')
-rw-r--r-- | sound/soc/atmel/mchp-spdiftx.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/sound/soc/atmel/mchp-spdiftx.c b/sound/soc/atmel/mchp-spdiftx.c index 78d5bcf0819a..cb4d0140dfe0 100644 --- a/sound/soc/atmel/mchp-spdiftx.c +++ b/sound/soc/atmel/mchp-spdiftx.c @@ -341,12 +341,10 @@ static int mchp_spdiftx_trigger(struct snd_pcm_substream *substream, int cmd, ret = regmap_write(dev->regmap, SPDIFTX_MR, mr); spin_unlock(&ctrl->lock); - if (ret) { + if (ret) dev_err(dev->dev, "unable to disable TX: %d\n", ret); - return ret; - } - return 0; + return ret; } static int mchp_spdiftx_hw_params(struct snd_pcm_substream *substream, @@ -763,8 +761,8 @@ static const struct of_device_id mchp_spdiftx_dt_ids[] = { }, { /* sentinel */ } }; - MODULE_DEVICE_TABLE(of, mchp_spdiftx_dt_ids); + static int mchp_spdiftx_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; @@ -848,12 +846,10 @@ static int mchp_spdiftx_probe(struct platform_device *pdev) err = devm_snd_soc_register_component(&pdev->dev, &mchp_spdiftx_component, &mchp_spdiftx_dai, 1); - if (err) { + if (err) dev_err(&pdev->dev, "failed to register component: %d\n", err); - return err; - } - return 0; + return err; } static struct platform_driver mchp_spdiftx_driver = { |