summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <swboyd@chromium.org>2019-07-30 14:15:49 -0400
committerMark Brown <broonie@kernel.org>2019-08-02 07:12:31 -0400
commitcf9441adb1a35506d7606866c382b9d8614169b5 (patch)
tree2d87c68471b25e4d7c345d9501a39e822d130203
parentf24e41d3d04f326613d8a7ebecf72c3019826f71 (diff)
ASoC: Remove dev_err() usage after platform_get_irq()
We don't need dev_err() messages when platform_get_irq() fails now that platform_get_irq() prints an error message itself when something goes wrong. Let's remove these prints with a simple semantic patch. // <smpl> @@ expression ret; struct platform_device *E; @@ ret = ( platform_get_irq(E, ...) | platform_get_irq_byname(E, ...) ); if ( \( ret < 0 \| ret <= 0 \) ) { ( -if (ret != -EPROBE_DEFER) -{ ... -dev_err(...); -... } | ... -dev_err(...); ) ... } // </smpl> While we're here, remove braces on if statements that only have one statement (manually). Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.com> Cc: alsa-devel@alsa-project.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> Link: https://lore.kernel.org/r/20190730181557.90391-50-swboyd@chromium.org Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/atmel/atmel-classd.c7
-rw-r--r--sound/soc/atmel/atmel-pdmic.c7
-rw-r--r--sound/soc/bcm/cygnus-ssp.c7
-rw-r--r--sound/soc/codecs/msm8916-wcd-analog.c12
-rw-r--r--sound/soc/codecs/twl6040.c4
-rw-r--r--sound/soc/fsl/fsl_asrc.c4
-rw-r--r--sound/soc/fsl/fsl_esai.c4
-rw-r--r--sound/soc/fsl/fsl_sai.c4
-rw-r--r--sound/soc/fsl/fsl_spdif.c4
-rw-r--r--sound/soc/fsl/fsl_ssi.c4
-rw-r--r--sound/soc/fsl/imx-ssi.c4
-rw-r--r--sound/soc/kirkwood/kirkwood-i2s.c4
-rw-r--r--sound/soc/mediatek/common/mtk-btcvsd.c4
-rw-r--r--sound/soc/mediatek/mt2701/mt2701-afe-pcm.c4
-rw-r--r--sound/soc/mediatek/mt8173/mt8173-afe-pcm.c4
-rw-r--r--sound/soc/mxs/mxs-saif.c8
-rw-r--r--sound/soc/qcom/lpass-platform.c5
-rw-r--r--sound/soc/sof/intel/bdw.c5
-rw-r--r--sound/soc/sof/intel/byt.c5
-rw-r--r--sound/soc/sprd/sprd-mcdt.c4
-rw-r--r--sound/soc/sti/sti_uniperif.c4
-rw-r--r--sound/soc/stm/stm32_i2s.c5
-rw-r--r--sound/soc/stm/stm32_sai.c4
-rw-r--r--sound/soc/stm/stm32_spdifrx.c4
-rw-r--r--sound/soc/sunxi/sun4i-i2s.c4
-rw-r--r--sound/soc/uniphier/aio-dma.c4
-rw-r--r--sound/soc/xilinx/xlnx_formatter_pcm.c2
-rw-r--r--sound/soc/xtensa/xtfpga-i2s.c1
28 files changed, 32 insertions, 100 deletions
diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
index 0f2c574f27f1..e98601eccfa3 100644
--- a/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@ -571,11 +571,8 @@ static int atmel_classd_probe(struct platform_device *pdev)
571 dd->pdata = pdata; 571 dd->pdata = pdata;
572 572
573 dd->irq = platform_get_irq(pdev, 0); 573 dd->irq = platform_get_irq(pdev, 0);
574 if (dd->irq < 0) { 574 if (dd->irq < 0)
575 ret = dd->irq; 575 return dd->irq;
576 dev_err(dev, "failed to could not get irq: %d\n", ret);
577 return ret;
578 }
579 576
580 dd->pclk = devm_clk_get(dev, "pclk"); 577 dd->pclk = devm_clk_get(dev, "pclk");
581 if (IS_ERR(dd->pclk)) { 578 if (IS_ERR(dd->pclk)) {
diff --git a/sound/soc/atmel/atmel-pdmic.c b/sound/soc/atmel/atmel-pdmic.c
index e09c28349e0d..04ec6f0af179 100644
--- a/sound/soc/atmel/atmel-pdmic.c
+++ b/sound/soc/atmel/atmel-pdmic.c
@@ -612,11 +612,8 @@ static int atmel_pdmic_probe(struct platform_device *pdev)
612 dd->dev = dev; 612 dd->dev = dev;
613 613
614 dd->irq = platform_get_irq(pdev, 0); 614 dd->irq = platform_get_irq(pdev, 0);
615 if (dd->irq < 0) { 615 if (dd->irq < 0)
616 ret = dd->irq; 616 return dd->irq;
617 dev_err(dev, "failed to get irq: %d\n", ret);
618 return ret;
619 }
620 617
621 dd->pclk = devm_clk_get(dev, "pclk"); 618 dd->pclk = devm_clk_get(dev, "pclk");
622 if (IS_ERR(dd->pclk)) { 619 if (IS_ERR(dd->pclk)) {
diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c
index b7c358b48d8d..2f9357d7da96 100644
--- a/sound/soc/bcm/cygnus-ssp.c
+++ b/sound/soc/bcm/cygnus-ssp.c
@@ -1342,11 +1342,8 @@ static int cygnus_ssp_probe(struct platform_device *pdev)
1342 } 1342 }
1343 1343
1344 cygaud->irq_num = platform_get_irq(pdev, 0); 1344 cygaud->irq_num = platform_get_irq(pdev, 0);
1345 if (cygaud->irq_num <= 0) { 1345 if (cygaud->irq_num <= 0)
1346 dev_err(dev, "platform_get_irq failed\n"); 1346 return cygaud->irq_num;
1347 err = cygaud->irq_num;
1348 return err;
1349 }
1350 1347
1351 err = audio_clk_init(pdev, cygaud); 1348 err = audio_clk_init(pdev, cygaud);
1352 if (err) { 1349 if (err) {
diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c
index 368b6c09474b..667e9f73aba3 100644
--- a/sound/soc/codecs/msm8916-wcd-analog.c
+++ b/sound/soc/codecs/msm8916-wcd-analog.c
@@ -1185,10 +1185,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)
1185 } 1185 }
1186 1186
1187 irq = platform_get_irq_byname(pdev, "mbhc_switch_int"); 1187 irq = platform_get_irq_byname(pdev, "mbhc_switch_int");
1188 if (irq < 0) { 1188 if (irq < 0)
1189 dev_err(dev, "failed to get mbhc switch irq\n");
1190 return irq; 1189 return irq;
1191 }
1192 1190
1193 ret = devm_request_threaded_irq(dev, irq, NULL, 1191 ret = devm_request_threaded_irq(dev, irq, NULL,
1194 pm8916_mbhc_switch_irq_handler, 1192 pm8916_mbhc_switch_irq_handler,
@@ -1200,10 +1198,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)
1200 1198
1201 if (priv->mbhc_btn_enabled) { 1199 if (priv->mbhc_btn_enabled) {
1202 irq = platform_get_irq_byname(pdev, "mbhc_but_press_det"); 1200 irq = platform_get_irq_byname(pdev, "mbhc_but_press_det");
1203 if (irq < 0) { 1201 if (irq < 0)
1204 dev_err(dev, "failed to get button press irq\n");
1205 return irq; 1202 return irq;
1206 }
1207 1203
1208 ret = devm_request_threaded_irq(dev, irq, NULL, 1204 ret = devm_request_threaded_irq(dev, irq, NULL,
1209 mbhc_btn_press_irq_handler, 1205 mbhc_btn_press_irq_handler,
@@ -1214,10 +1210,8 @@ static int pm8916_wcd_analog_spmi_probe(struct platform_device *pdev)
1214 dev_err(dev, "cannot request mbhc button press irq\n"); 1210 dev_err(dev, "cannot request mbhc button press irq\n");
1215 1211
1216 irq = platform_get_irq_byname(pdev, "mbhc_but_rel_det"); 1212 irq = platform_get_irq_byname(pdev, "mbhc_but_rel_det");
1217 if (irq < 0) { 1213 if (irq < 0)
1218 dev_err(dev, "failed to get button release irq\n");
1219 return irq; 1214 return irq;
1220 }
1221 1215
1222 ret = devm_request_threaded_irq(dev, irq, NULL, 1216 ret = devm_request_threaded_irq(dev, irq, NULL,
1223 mbhc_btn_release_irq_handler, 1217 mbhc_btn_release_irq_handler,
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index 472c2fff34a8..f34637afee51 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -1108,10 +1108,8 @@ static int twl6040_probe(struct snd_soc_component *component)
1108 priv->component = component; 1108 priv->component = component;
1109 1109
1110 priv->plug_irq = platform_get_irq(pdev, 0); 1110 priv->plug_irq = platform_get_irq(pdev, 0);
1111 if (priv->plug_irq < 0) { 1111 if (priv->plug_irq < 0)
1112 dev_err(component->dev, "invalid irq: %d\n", priv->plug_irq);
1113 return priv->plug_irq; 1112 return priv->plug_irq;
1114 }
1115 1113
1116 INIT_DELAYED_WORK(&priv->hs_jack.work, twl6040_accessory_work); 1114 INIT_DELAYED_WORK(&priv->hs_jack.work, twl6040_accessory_work);
1117 1115
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
index cbbf6257f08a..cfa40ef6b1ca 100644
--- a/sound/soc/fsl/fsl_asrc.c
+++ b/sound/soc/fsl/fsl_asrc.c
@@ -885,10 +885,8 @@ static int fsl_asrc_probe(struct platform_device *pdev)
885 } 885 }
886 886
887 irq = platform_get_irq(pdev, 0); 887 irq = platform_get_irq(pdev, 0);
888 if (irq < 0) { 888 if (irq < 0)
889 dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
890 return irq; 889 return irq;
891 }
892 890
893 ret = devm_request_irq(&pdev->dev, irq, fsl_asrc_isr, 0, 891 ret = devm_request_irq(&pdev->dev, irq, fsl_asrc_isr, 0,
894 dev_name(&pdev->dev), asrc_priv); 892 dev_name(&pdev->dev), asrc_priv);
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
index 4ce8ac769244..5832144beb9f 100644
--- a/sound/soc/fsl/fsl_esai.c
+++ b/sound/soc/fsl/fsl_esai.c
@@ -962,10 +962,8 @@ static int fsl_esai_probe(struct platform_device *pdev)
962 PTR_ERR(esai_priv->spbaclk)); 962 PTR_ERR(esai_priv->spbaclk));
963 963
964 irq = platform_get_irq(pdev, 0); 964 irq = platform_get_irq(pdev, 0);
965 if (irq < 0) { 965 if (irq < 0)
966 dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
967 return irq; 966 return irq;
968 }
969 967
970 ret = devm_request_irq(&pdev->dev, irq, esai_isr, 0, 968 ret = devm_request_irq(&pdev->dev, irq, esai_isr, 0,
971 esai_priv->name, esai_priv); 969 esai_priv->name, esai_priv);
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 6d3c6c8d50ce..8f4d9fa95599 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -831,10 +831,8 @@ static int fsl_sai_probe(struct platform_device *pdev)
831 } 831 }
832 832
833 irq = platform_get_irq(pdev, 0); 833 irq = platform_get_irq(pdev, 0);
834 if (irq < 0) { 834 if (irq < 0)
835 dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
836 return irq; 835 return irq;
837 }
838 836
839 ret = devm_request_irq(&pdev->dev, irq, fsl_sai_isr, 0, np->name, sai); 837 ret = devm_request_irq(&pdev->dev, irq, fsl_sai_isr, 0, np->name, sai);
840 if (ret) { 838 if (ret) {
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index 4842e6df9a2d..7858a5499ac5 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -1248,10 +1248,8 @@ static int fsl_spdif_probe(struct platform_device *pdev)
1248 } 1248 }
1249 1249
1250 irq = platform_get_irq(pdev, 0); 1250 irq = platform_get_irq(pdev, 0);
1251 if (irq < 0) { 1251 if (irq < 0)
1252 dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
1253 return irq; 1252 return irq;
1254 }
1255 1253
1256 ret = devm_request_irq(&pdev->dev, irq, spdif_isr, 0, 1254 ret = devm_request_irq(&pdev->dev, irq, spdif_isr, 0,
1257 dev_name(&pdev->dev), spdif_priv); 1255 dev_name(&pdev->dev), spdif_priv);
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index fa862af25c1a..b0a6fead1a6a 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1510,10 +1510,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
1510 } 1510 }
1511 1511
1512 ssi->irq = platform_get_irq(pdev, 0); 1512 ssi->irq = platform_get_irq(pdev, 0);
1513 if (ssi->irq < 0) { 1513 if (ssi->irq < 0)
1514 dev_err(dev, "no irq for node %s\n", pdev->name);
1515 return ssi->irq; 1514 return ssi->irq;
1516 }
1517 1515
1518 /* Set software limitations for synchronous mode except AC97 */ 1516 /* Set software limitations for synchronous mode except AC97 */
1519 if (ssi->synchronous && !fsl_ssi_is_ac97(ssi)) { 1517 if (ssi->synchronous && !fsl_ssi_is_ac97(ssi)) {
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 9038b61317be..42031ba7da31 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -520,10 +520,8 @@ static int imx_ssi_probe(struct platform_device *pdev)
520 } 520 }
521 521
522 ssi->irq = platform_get_irq(pdev, 0); 522 ssi->irq = platform_get_irq(pdev, 0);
523 if (ssi->irq < 0) { 523 if (ssi->irq < 0)
524 dev_err(&pdev->dev, "Failed to get IRQ: %d\n", ssi->irq);
525 return ssi->irq; 524 return ssi->irq;
526 }
527 525
528 ssi->clk = devm_clk_get(&pdev->dev, NULL); 526 ssi->clk = devm_clk_get(&pdev->dev, NULL);
529 if (IS_ERR(ssi->clk)) { 527 if (IS_ERR(ssi->clk)) {
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 5076ec4cc7a6..61226fefe1c4 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -537,10 +537,8 @@ static int kirkwood_i2s_dev_probe(struct platform_device *pdev)
537 return PTR_ERR(priv->io); 537 return PTR_ERR(priv->io);
538 538
539 priv->irq = platform_get_irq(pdev, 0); 539 priv->irq = platform_get_irq(pdev, 0);
540 if (priv->irq < 0) { 540 if (priv->irq < 0)
541 dev_err(&pdev->dev, "platform_get_irq failed: %d\n", priv->irq);
542 return priv->irq; 541 return priv->irq;
543 }
544 542
545 if (np) { 543 if (np) {
546 priv->burst = 128; /* might be 32 or 128 */ 544 priv->burst = 128; /* might be 32 or 128 */
diff --git a/sound/soc/mediatek/common/mtk-btcvsd.c b/sound/soc/mediatek/common/mtk-btcvsd.c
index c7a81c4be068..d00608c73c6e 100644
--- a/sound/soc/mediatek/common/mtk-btcvsd.c
+++ b/sound/soc/mediatek/common/mtk-btcvsd.c
@@ -1335,10 +1335,8 @@ static int mtk_btcvsd_snd_probe(struct platform_device *pdev)
1335 1335
1336 /* irq */ 1336 /* irq */
1337 irq_id = platform_get_irq(pdev, 0); 1337 irq_id = platform_get_irq(pdev, 0);
1338 if (irq_id <= 0) { 1338 if (irq_id <= 0)
1339 dev_err(dev, "%pOFn no irq found\n", dev->of_node);
1340 return irq_id < 0 ? irq_id : -ENXIO; 1339 return irq_id < 0 ? irq_id : -ENXIO;
1341 }
1342 1340
1343 ret = devm_request_irq(dev, irq_id, mtk_btcvsd_snd_irq_handler, 1341 ret = devm_request_irq(dev, irq_id, mtk_btcvsd_snd_irq_handler,
1344 IRQF_TRIGGER_LOW, "BTCVSD_ISR_Handle", 1342 IRQF_TRIGGER_LOW, "BTCVSD_ISR_Handle",
diff --git a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
index 7064a9fd6f74..9af76ae315a5 100644
--- a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
+++ b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
@@ -1342,10 +1342,8 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
1342 return -ENOMEM; 1342 return -ENOMEM;
1343 1343
1344 irq_id = platform_get_irq_byname(pdev, "asys"); 1344 irq_id = platform_get_irq_byname(pdev, "asys");
1345 if (irq_id < 0) { 1345 if (irq_id < 0)
1346 dev_err(dev, "unable to get ASYS IRQ\n");
1347 return irq_id; 1346 return irq_id;
1348 }
1349 1347
1350 ret = devm_request_irq(dev, irq_id, mt2701_asys_isr, 1348 ret = devm_request_irq(dev, irq_id, mt2701_asys_isr,
1351 IRQF_TRIGGER_NONE, "asys-isr", (void *)afe); 1349 IRQF_TRIGGER_NONE, "asys-isr", (void *)afe);
diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
index 90bd2c92cae7..0ee29255e731 100644
--- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
+++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
@@ -1074,10 +1074,8 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev)
1074 afe->dev = &pdev->dev; 1074 afe->dev = &pdev->dev;
1075 1075
1076 irq_id = platform_get_irq(pdev, 0); 1076 irq_id = platform_get_irq(pdev, 0);
1077 if (irq_id <= 0) { 1077 if (irq_id <= 0)
1078 dev_err(afe->dev, "np %pOFn no irq\n", afe->dev->of_node);
1079 return irq_id < 0 ? irq_id : -ENXIO; 1078 return irq_id < 0 ? irq_id : -ENXIO;
1080 }
1081 ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler, 1079 ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler,
1082 0, "Afe_ISR_Handle", (void *)afe); 1080 0, "Afe_ISR_Handle", (void *)afe);
1083 if (ret) { 1081 if (ret) {
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index a2c79426513b..1e38ce858326 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -790,12 +790,8 @@ static int mxs_saif_probe(struct platform_device *pdev)
790 return PTR_ERR(saif->base); 790 return PTR_ERR(saif->base);
791 791
792 irq = platform_get_irq(pdev, 0); 792 irq = platform_get_irq(pdev, 0);
793 if (irq < 0) { 793 if (irq < 0)
794 ret = irq; 794 return irq;
795 dev_err(&pdev->dev, "failed to get irq resource: %d\n",
796 ret);
797 return ret;
798 }
799 795
800 saif->dev = &pdev->dev; 796 saif->dev = &pdev->dev;
801 ret = devm_request_irq(&pdev->dev, irq, mxs_saif_irq, 0, 797 ret = devm_request_irq(&pdev->dev, irq, mxs_saif_irq, 0,
diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c
index cf7a299f4547..4c745baa39f7 100644
--- a/sound/soc/qcom/lpass-platform.c
+++ b/sound/soc/qcom/lpass-platform.c
@@ -564,11 +564,8 @@ int asoc_qcom_lpass_platform_register(struct platform_device *pdev)
564 int ret; 564 int ret;
565 565
566 drvdata->lpaif_irq = platform_get_irq_byname(pdev, "lpass-irq-lpaif"); 566 drvdata->lpaif_irq = platform_get_irq_byname(pdev, "lpass-irq-lpaif");
567 if (drvdata->lpaif_irq < 0) { 567 if (drvdata->lpaif_irq < 0)
568 dev_err(&pdev->dev, "error getting irq handle: %d\n",
569 drvdata->lpaif_irq);
570 return -ENODEV; 568 return -ENODEV;
571 }
572 569
573 /* ensure audio hardware is disabled */ 570 /* ensure audio hardware is disabled */
574 ret = regmap_write(drvdata->lpaif_map, 571 ret = regmap_write(drvdata->lpaif_map,
diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
index 70d524ef9bc0..4bb9636da990 100644
--- a/sound/soc/sof/intel/bdw.c
+++ b/sound/soc/sof/intel/bdw.c
@@ -613,11 +613,8 @@ static int bdw_probe(struct snd_sof_dev *sdev)
613 613
614 /* register our IRQ */ 614 /* register our IRQ */
615 sdev->ipc_irq = platform_get_irq(pdev, desc->irqindex_host_ipc); 615 sdev->ipc_irq = platform_get_irq(pdev, desc->irqindex_host_ipc);
616 if (sdev->ipc_irq < 0) { 616 if (sdev->ipc_irq < 0)
617 dev_err(sdev->dev, "error: failed to get IRQ at index %d\n",
618 desc->irqindex_host_ipc);
619 return sdev->ipc_irq; 617 return sdev->ipc_irq;
620 }
621 618
622 dev_dbg(sdev->dev, "using IRQ %d\n", sdev->ipc_irq); 619 dev_dbg(sdev->dev, "using IRQ %d\n", sdev->ipc_irq);
623 ret = devm_request_threaded_irq(sdev->dev, sdev->ipc_irq, 620 ret = devm_request_threaded_irq(sdev->dev, sdev->ipc_irq,
diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c
index 107d711efc3f..000d576f6a8d 100644
--- a/sound/soc/sof/intel/byt.c
+++ b/sound/soc/sof/intel/byt.c
@@ -728,11 +728,8 @@ static int byt_acpi_probe(struct snd_sof_dev *sdev)
728irq: 728irq:
729 /* register our IRQ */ 729 /* register our IRQ */
730 sdev->ipc_irq = platform_get_irq(pdev, desc->irqindex_host_ipc); 730 sdev->ipc_irq = platform_get_irq(pdev, desc->irqindex_host_ipc);
731 if (sdev->ipc_irq < 0) { 731 if (sdev->ipc_irq < 0)
732 dev_err(sdev->dev, "error: failed to get IRQ at index %d\n",
733 desc->irqindex_host_ipc);
734 return sdev->ipc_irq; 732 return sdev->ipc_irq;
735 }
736 733
737 dev_dbg(sdev->dev, "using IRQ %d\n", sdev->ipc_irq); 734 dev_dbg(sdev->dev, "using IRQ %d\n", sdev->ipc_irq);
738 ret = devm_request_threaded_irq(sdev->dev, sdev->ipc_irq, 735 ret = devm_request_threaded_irq(sdev->dev, sdev->ipc_irq,
diff --git a/sound/soc/sprd/sprd-mcdt.c b/sound/soc/sprd/sprd-mcdt.c
index 7448015a4935..f439e5503a3c 100644
--- a/sound/soc/sprd/sprd-mcdt.c
+++ b/sound/soc/sprd/sprd-mcdt.c
@@ -959,10 +959,8 @@ static int sprd_mcdt_probe(struct platform_device *pdev)
959 platform_set_drvdata(pdev, mcdt); 959 platform_set_drvdata(pdev, mcdt);
960 960
961 irq = platform_get_irq(pdev, 0); 961 irq = platform_get_irq(pdev, 0);
962 if (irq < 0) { 962 if (irq < 0)
963 dev_err(&pdev->dev, "Failed to get MCDT interrupt\n");
964 return irq; 963 return irq;
965 }
966 964
967 ret = devm_request_irq(&pdev->dev, irq, sprd_mcdt_irq_handler, 965 ret = devm_request_irq(&pdev->dev, irq, sprd_mcdt_irq_handler,
968 0, "sprd-mcdt", mcdt); 966 0, "sprd-mcdt", mcdt);
diff --git a/sound/soc/sti/sti_uniperif.c b/sound/soc/sti/sti_uniperif.c
index 645bcbe91601..ee4a0151e63e 100644
--- a/sound/soc/sti/sti_uniperif.c
+++ b/sound/soc/sti/sti_uniperif.c
@@ -426,10 +426,8 @@ static int sti_uniperiph_cpu_dai_of(struct device_node *node,
426 UNIPERIF_FIFO_DATA_OFFSET(uni); 426 UNIPERIF_FIFO_DATA_OFFSET(uni);
427 427
428 uni->irq = platform_get_irq(priv->pdev, 0); 428 uni->irq = platform_get_irq(priv->pdev, 0);
429 if (uni->irq < 0) { 429 if (uni->irq < 0)
430 dev_err(dev, "Failed to get IRQ resource\n");
431 return -ENXIO; 430 return -ENXIO;
432 }
433 431
434 uni->type = dev_data->type; 432 uni->type = dev_data->type;
435 433
diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c
index ba6452dab69b..3e7226a53e53 100644
--- a/sound/soc/stm/stm32_i2s.c
+++ b/sound/soc/stm/stm32_i2s.c
@@ -855,11 +855,8 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev,
855 855
856 /* Get irqs */ 856 /* Get irqs */
857 irq = platform_get_irq(pdev, 0); 857 irq = platform_get_irq(pdev, 0);
858 if (irq < 0) { 858 if (irq < 0)
859 if (irq != -EPROBE_DEFER)
860 dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
861 return irq; 859 return irq;
862 }
863 860
864 ret = devm_request_irq(&pdev->dev, irq, stm32_i2s_isr, IRQF_ONESHOT, 861 ret = devm_request_irq(&pdev->dev, irq, stm32_i2s_isr, IRQF_ONESHOT,
865 dev_name(&pdev->dev), i2s); 862 dev_name(&pdev->dev), i2s);
diff --git a/sound/soc/stm/stm32_sai.c b/sound/soc/stm/stm32_sai.c
index 1ac5103cea78..ef4273361d0d 100644
--- a/sound/soc/stm/stm32_sai.c
+++ b/sound/soc/stm/stm32_sai.c
@@ -193,10 +193,8 @@ static int stm32_sai_probe(struct platform_device *pdev)
193 193
194 /* init irqs */ 194 /* init irqs */
195 sai->irq = platform_get_irq(pdev, 0); 195 sai->irq = platform_get_irq(pdev, 0);
196 if (sai->irq < 0) { 196 if (sai->irq < 0)
197 dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
198 return sai->irq; 197 return sai->irq;
199 }
200 198
201 /* reset */ 199 /* reset */
202 rst = devm_reset_control_get_exclusive(&pdev->dev, NULL); 200 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 ee71b898897b..cd4b235fce57 100644
--- a/sound/soc/stm/stm32_spdifrx.c
+++ b/sound/soc/stm/stm32_spdifrx.c
@@ -909,10 +909,8 @@ static int stm32_spdifrx_parse_of(struct platform_device *pdev,
909 } 909 }
910 910
911 spdifrx->irq = platform_get_irq(pdev, 0); 911 spdifrx->irq = platform_get_irq(pdev, 0);
912 if (spdifrx->irq < 0) { 912 if (spdifrx->irq < 0)
913 dev_err(&pdev->dev, "No irq for node %s\n", pdev->name);
914 return spdifrx->irq; 913 return spdifrx->irq;
915 }
916 914
917 return 0; 915 return 0;
918} 916}
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index 9b2232908b65..d97d694c48df 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -1087,10 +1087,8 @@ static int sun4i_i2s_probe(struct platform_device *pdev)
1087 return PTR_ERR(regs); 1087 return PTR_ERR(regs);
1088 1088
1089 irq = platform_get_irq(pdev, 0); 1089 irq = platform_get_irq(pdev, 0);
1090 if (irq < 0) { 1090 if (irq < 0)
1091 dev_err(&pdev->dev, "Can't retrieve our interrupt\n");
1092 return irq; 1091 return irq;
1093 }
1094 1092
1095 i2s->variant = of_device_get_match_data(&pdev->dev); 1093 i2s->variant = of_device_get_match_data(&pdev->dev);
1096 if (!i2s->variant) { 1094 if (!i2s->variant) {
diff --git a/sound/soc/uniphier/aio-dma.c b/sound/soc/uniphier/aio-dma.c
index 862346d66774..e8446cc4e8f8 100644
--- a/sound/soc/uniphier/aio-dma.c
+++ b/sound/soc/uniphier/aio-dma.c
@@ -289,10 +289,8 @@ int uniphier_aiodma_soc_register_platform(struct platform_device *pdev)
289 return PTR_ERR(chip->regmap); 289 return PTR_ERR(chip->regmap);
290 290
291 irq = platform_get_irq(pdev, 0); 291 irq = platform_get_irq(pdev, 0);
292 if (irq < 0) { 292 if (irq < 0)
293 dev_err(dev, "Could not get irq.\n");
294 return irq; 293 return irq;
295 }
296 294
297 ret = devm_request_irq(dev, irq, aiodma_irq, 295 ret = devm_request_irq(dev, irq, aiodma_irq,
298 IRQF_SHARED, dev_name(dev), pdev); 296 IRQF_SHARED, dev_name(dev), pdev);
diff --git a/sound/soc/xilinx/xlnx_formatter_pcm.c b/sound/soc/xilinx/xlnx_formatter_pcm.c
index dc8721f4f56b..48970efe7838 100644
--- a/sound/soc/xilinx/xlnx_formatter_pcm.c
+++ b/sound/soc/xilinx/xlnx_formatter_pcm.c
@@ -613,7 +613,6 @@ static int xlnx_formatter_pcm_probe(struct platform_device *pdev)
613 aud_drv_data->mm2s_irq = platform_get_irq_byname(pdev, 613 aud_drv_data->mm2s_irq = platform_get_irq_byname(pdev,
614 "irq_mm2s"); 614 "irq_mm2s");
615 if (aud_drv_data->mm2s_irq < 0) { 615 if (aud_drv_data->mm2s_irq < 0) {
616 dev_err(dev, "xlnx audio mm2s irq resource failed\n");
617 ret = aud_drv_data->mm2s_irq; 616 ret = aud_drv_data->mm2s_irq;
618 goto clk_err; 617 goto clk_err;
619 } 618 }
@@ -640,7 +639,6 @@ static int xlnx_formatter_pcm_probe(struct platform_device *pdev)
640 aud_drv_data->s2mm_irq = platform_get_irq_byname(pdev, 639 aud_drv_data->s2mm_irq = platform_get_irq_byname(pdev,
641 "irq_s2mm"); 640 "irq_s2mm");
642 if (aud_drv_data->s2mm_irq < 0) { 641 if (aud_drv_data->s2mm_irq < 0) {
643 dev_err(dev, "xlnx audio s2mm irq resource failed\n");
644 ret = aud_drv_data->s2mm_irq; 642 ret = aud_drv_data->s2mm_irq;
645 goto clk_err; 643 goto clk_err;
646 } 644 }
diff --git a/sound/soc/xtensa/xtfpga-i2s.c b/sound/soc/xtensa/xtfpga-i2s.c
index 9da395d14a8d..efd374f114a0 100644
--- a/sound/soc/xtensa/xtfpga-i2s.c
+++ b/sound/soc/xtensa/xtfpga-i2s.c
@@ -570,7 +570,6 @@ static int xtfpga_i2s_probe(struct platform_device *pdev)
570 570
571 irq = platform_get_irq(pdev, 0); 571 irq = platform_get_irq(pdev, 0);
572 if (irq < 0) { 572 if (irq < 0) {
573 dev_err(&pdev->dev, "No IRQ resource\n");
574 err = irq; 573 err = irq;
575 goto err; 574 goto err;
576 } 575 }