ASoC: ti: davinci-mcasp: Use platform_get_irq_byname_optional

[ Upstream commit 372c4bd11de1793667e11d19c29fffc80495eeca ]

Depending on the integration of McASP either the 'common' or the
'rx' and 'tx' or only the 'tx' interrupt number is valid, provided.

By switching to platform_get_irq_byname_optional() we can clean up the
bootlog from messages like:

davinci-mcasp 2ba0000.mcasp: IRQ common not found

The irq number == 0 is not valid, fix the check at the same time.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20201106072551.689-2-peter.ujfalusi@ti.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: d18ca8635db2 ("ASoC: ti: davinci-mcasp: Fix race condition during probe")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
index b08948ffc61d01ba74e04fb1150555adf075601d..7860382a17a2861c28a138ef929ec96e7ce179e8 100644 (file)
--- a/sound/soc/ti/davinci-mcasp.c
+++ b/sound/soc/ti/davinci-mcasp.c
@@ -2174,8 +2174,8 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
 
        mcasp->dev = &pdev->dev;
 
-       irq = platform_get_irq_byname(pdev, "common");
-       if (irq >= 0) {
+       irq = platform_get_irq_byname_optional(pdev, "common");
+       if (irq > 0) {
                irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_common",
                                          dev_name(&pdev->dev));
                if (!irq_name) {
@@ -2195,8 +2195,8 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
                mcasp->irq_request[SNDRV_PCM_STREAM_CAPTURE] = ROVRN;
        }
 
-       irq = platform_get_irq_byname(pdev, "rx");
-       if (irq >= 0) {
+       irq = platform_get_irq_byname_optional(pdev, "rx");
+       if (irq > 0) {
                irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_rx",
                                          dev_name(&pdev->dev));
                if (!irq_name) {
@@ -2214,8 +2214,8 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
                mcasp->irq_request[SNDRV_PCM_STREAM_CAPTURE] = ROVRN;
        }
 
-       irq = platform_get_irq_byname(pdev, "tx");
-       if (irq >= 0) {
+       irq = platform_get_irq_byname_optional(pdev, "tx");
+       if (irq > 0) {
                irq_name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s_tx",
                                          dev_name(&pdev->dev));
                if (!irq_name) {