mmc: renesas_sdhi: Do not use platform_get_irq() to count interrupts (e8307ec5) · Commits · 戴 / test

As platform_get_irq() now prints an error when the interrupt does not exist, counting interrupts by looping until failure causes the printing of scary messages like: renesas_sdhi_internal_dmac ee140000.sd: IRQ index 1 not found Fix this by using the platform_irq_count() helper to avoid touching non-existent interrupts. Fixes: ("driver core: platform: Add an error message to platform_get_irq*()") Signed-off-by:

Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by:

Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Reviewed-by:

Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by:

Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Tested-by:

Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/host/renesas_sdhi_core.c

+19 −12

Original line number	Diff line number	Diff line
		@@ -646,8 +646,8 @@ int renesas_sdhi_probe(struct platform_device *pdev,
		struct tmio_mmc_dma *dma_priv;
		struct tmio_mmc_host *host;
		struct renesas_sdhi *priv;
		int num_irqs, irq, ret, i;
		struct resource *res;
		int irq, ret, i;
		u16 ver;

		of_data = of_device_get_match_data(&pdev->dev);
		@@ -825,24 +825,31 @@ int renesas_sdhi_probe(struct platform_device *pdev,
		host->hs400_complete = renesas_sdhi_hs400_complete;
		}

		i = 0;
		while (1) {
		irq = platform_get_irq(pdev, i);
		if (irq < 0)
		break;
		i++;
		ret = devm_request_irq(&pdev->dev, irq, tmio_mmc_irq, 0,
		dev_name(&pdev->dev), host);
		if (ret)
		num_irqs = platform_irq_count(pdev);
		if (num_irqs < 0) {
		ret = num_irqs;
		goto eirq;
		}

		/* There must be at least one IRQ source */
		if (!i) {
		if (!num_irqs) {
		ret = -ENXIO;
		goto eirq;
		}

		for (i = 0; i < num_irqs; i++) {
		irq = platform_get_irq(pdev, i);
		if (irq < 0) {
		ret = irq;
		goto eirq;
		}

		ret = devm_request_irq(&pdev->dev, irq, tmio_mmc_irq, 0,
		dev_name(&pdev->dev), host);
		if (ret)
		goto eirq;
		}

		dev_info(&pdev->dev, "%s base at 0x%08lx max clock rate %u MHz\n",
		mmc_hostname(host->mmc), (unsigned long)
		(platform_get_resource(pdev, IORESOURCE_MEM, 0)->start),

Admin message