diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-08-16 18:01:53 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-11-25 15:53:33 +0800 |
| commit | f337340c236307558df0f79d28bc4e4177d6a8cc (patch) | |
| tree | c266fd286704c3060e9757fed499db3f50be9619 /sound/soc/stm | |
| parent | ab150b3f7c5606bce09b295e2a854559718f58ae (diff) | |
Revert "ASoC: Remove dev_err() usage after platform_get_irq()"
This reverts commit cf9441adb1a35506d7606866c382b9d8614169b5.
Diffstat (limited to 'sound/soc/stm')
| -rw-r--r-- | sound/soc/stm/stm32_i2s.c | 5 | ||||
| -rw-r--r-- | sound/soc/stm/stm32_sai.c | 4 | ||||
| -rw-r--r-- | sound/soc/stm/stm32_spdifrx.c | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 3e7226a53e53..ba6452dab69b 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -855,8 +855,11 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev, /* Get irqs */ irq = platform_get_irq(pdev, 0); - if (irq < 0) + if (irq < 0) { + if (irq != -EPROBE_DEFER) + dev_err(&pdev->dev, "no irq for node %s\n", pdev->name); return irq; + } ret = devm_request_irq(&pdev->dev, irq, stm32_i2s_isr, IRQF_ONESHOT, dev_name(&pdev->dev), i2s); diff --git a/sound/soc/stm/stm32_sai.c b/sound/soc/stm/stm32_sai.c index ef4273361d0d..1ac5103cea78 100644 --- a/sound/soc/stm/stm32_sai.c +++ b/sound/soc/stm/stm32_sai.c @@ -193,8 +193,10 @@ static int stm32_sai_probe(struct platform_device *pdev) /* init irqs */ sai->irq = platform_get_irq(pdev, 0); - if (sai->irq < 0) + if (sai->irq < 0) { + dev_err(&pdev->dev, "no irq for node %s\n", pdev->name); return sai->irq; + } /* reset */ rst = devm_reset_control_get_exclusive(&pdev->dev, NULL); diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c index cd4b235fce57..ee71b898897b 100644 --- a/sound/soc/stm/stm32_spdifrx.c +++ b/sound/soc/stm/stm32_spdifrx.c @@ -909,8 +909,10 @@ static int stm32_spdifrx_parse_of(struct platform_device *pdev, } spdifrx->irq = platform_get_irq(pdev, 0); - if (spdifrx->irq < 0) + if (spdifrx->irq < 0) { + dev_err(&pdev->dev, "No irq for node %s\n", pdev->name); return spdifrx->irq; + } return 0; } |