ASoC: sh: rz-ssi: Propagate error codes returned from platform_get_irq_byname()
authorLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Tue, 26 Apr 2022 07:49:21 +0000 (08:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jun 2022 08:23:08 +0000 (10:23 +0200)
[ Upstream commit 91686a3984f34df0ab844cdbaa7e4d9621129f5d ]

Propagate error codes returned from platform_get_irq_byname() instead of
returning -ENODEV. platform_get_irq_byname() may return -EPROBE_DEFER, to
handle such cases propagate the error codes.

While at it drop the dev_err_probe() messages as platform_get_irq_byname()
already does this for us in case of error.

Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Link: https://lore.kernel.org/r/20220426074922.13319-3-prabhakar.mahadev-lad.rj@bp.renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/sh/rz-ssi.c

index 7379b14..3b55444 100644 (file)
@@ -983,8 +983,7 @@ static int rz_ssi_probe(struct platform_device *pdev)
        /* Error Interrupt */
        ssi->irq_int = platform_get_irq_byname(pdev, "int_req");
        if (ssi->irq_int < 0)
-               return dev_err_probe(&pdev->dev, -ENODEV,
-                                    "Unable to get SSI int_req IRQ\n");
+               return ssi->irq_int;
 
        ret = devm_request_irq(&pdev->dev, ssi->irq_int, &rz_ssi_interrupt,
                               0, dev_name(&pdev->dev), ssi);
@@ -996,8 +995,7 @@ static int rz_ssi_probe(struct platform_device *pdev)
                /* Tx and Rx interrupts (pio only) */
                ssi->irq_tx = platform_get_irq_byname(pdev, "dma_tx");
                if (ssi->irq_tx < 0)
-                       return dev_err_probe(&pdev->dev, -ENODEV,
-                                            "Unable to get SSI dma_tx IRQ\n");
+                       return ssi->irq_tx;
 
                ret = devm_request_irq(&pdev->dev, ssi->irq_tx,
                                       &rz_ssi_interrupt, 0,
@@ -1008,8 +1006,7 @@ static int rz_ssi_probe(struct platform_device *pdev)
 
                ssi->irq_rx = platform_get_irq_byname(pdev, "dma_rx");
                if (ssi->irq_rx < 0)
-                       return dev_err_probe(&pdev->dev, -ENODEV,
-                                            "Unable to get SSI dma_rx IRQ\n");
+                       return ssi->irq_rx;
 
                ret = devm_request_irq(&pdev->dev, ssi->irq_rx,
                                       &rz_ssi_interrupt, 0,