diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-15 10:31:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-15 10:31:44 +0100 |
| commit | a54f8485727e6e85b5dfe1d9708b80d13fe8bf5f (patch) | |
| tree | 9d38878259b080ffa01e1e398094906ee4e988fe /sound/soc/stm/stm32_sai.c | |
| parent | 7e0d8442e4fbc1e2033607d3b9e7d9c7d8a404ec (diff) | |
| parent | fca11622d600228bec405456f41590155b3a3eca (diff) | |
Merge branch 'asoc-5.4' into asoc-next
Diffstat (limited to 'sound/soc/stm/stm32_sai.c')
| -rw-r--r-- | sound/soc/stm/stm32_sai.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/stm/stm32_sai.c b/sound/soc/stm/stm32_sai.c index 63f68e663676..ef4273361d0d 100644 --- a/sound/soc/stm/stm32_sai.c +++ b/sound/soc/stm/stm32_sai.c @@ -152,7 +152,6 @@ static int stm32_sai_probe(struct platform_device *pdev) { struct stm32_sai_data *sai; struct reset_control *rst; - struct resource *res; const struct of_device_id *of_id; u32 val; int ret; @@ -161,8 +160,7 @@ static int stm32_sai_probe(struct platform_device *pdev) if (!sai) return -ENOMEM; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - sai->base = devm_ioremap_resource(&pdev->dev, res); + sai->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(sai->base)) return PTR_ERR(sai->base); @@ -195,10 +193,8 @@ static int stm32_sai_probe(struct platform_device *pdev) /* init irqs */ sai->irq = platform_get_irq(pdev, 0); - if (sai->irq < 0) { - dev_err(&pdev->dev, "no irq for node %s\n", pdev->name); + if (sai->irq < 0) return sai->irq; - } /* reset */ rst = devm_reset_control_get_exclusive(&pdev->dev, NULL); |