All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sergey Shtylyov <s.shtylyov@omp.ru>
To: Ulf Hansson <ulf.hansson@linaro.org>, <linux-mmc@vger.kernel.org>
Cc: Chen-Yu Tsai <wens@csie.org>,
	Jernej Skrabec <jernej.skrabec@gmail.com>,
	Samuel Holland <samuel@sholland.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-sunxi@lists.linux.dev>, <stable@vger.kernel.org>
Subject: [PATCH v3 11/12] mmc: sunxi: fix deferred probing
Date: Sat, 17 Jun 2023 23:36:21 +0300	[thread overview]
Message-ID: <20230617203622.6812-12-s.shtylyov@omp.ru> (raw)
In-Reply-To: <20230617203622.6812-1-s.shtylyov@omp.ru>

The driver overrides the error codes and IRQ0 returned by platform_get_irq()
to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe
permanently instead of the deferred probing. Switch to propagating the error
codes upstream.  Since commit ce753ad1549c ("platform: finally disallow IRQ0
in platform_get_irq() and its ilk") IRQ0 is no longer returned by those APIs,
so we now can safely ignore it...

Fixes: 2408a08583d ("mmc: sunxi-mmc: Handle return value of platform_get_irq")
Cc: stable@vger.kernel.org # v5.19+
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
Changes in version 3:
- added the platform_get_irq() commit reference to the  patch description and
  the Cc: tag marking the 1st kernel version containing it;
- added Jernej's tag.

Changes in version 2:
- slightly reformatted the patch description.

 drivers/mmc/host/sunxi-mmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index 3db9f32d6a7b..69dcb8805e05 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -1350,8 +1350,8 @@ static int sunxi_mmc_resource_request(struct sunxi_mmc_host *host,
 		return ret;
 
 	host->irq = platform_get_irq(pdev, 0);
-	if (host->irq <= 0) {
-		ret = -EINVAL;
+	if (host->irq < 0) {
+		ret = host->irq;
 		goto error_disable_mmc;
 	}
 
-- 
2.26.3


WARNING: multiple messages have this Message-ID (diff)
From: Sergey Shtylyov <s.shtylyov@omp.ru>
To: Ulf Hansson <ulf.hansson@linaro.org>, <linux-mmc@vger.kernel.org>
Cc: Chen-Yu Tsai <wens@csie.org>,
	Jernej Skrabec <jernej.skrabec@gmail.com>,
	Samuel Holland <samuel@sholland.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-sunxi@lists.linux.dev>, <stable@vger.kernel.org>
Subject: [PATCH v3 11/12] mmc: sunxi: fix deferred probing
Date: Sat, 17 Jun 2023 23:36:21 +0300	[thread overview]
Message-ID: <20230617203622.6812-12-s.shtylyov@omp.ru> (raw)
In-Reply-To: <20230617203622.6812-1-s.shtylyov@omp.ru>

The driver overrides the error codes and IRQ0 returned by platform_get_irq()
to -EINVAL, so if it returns -EPROBE_DEFER, the driver will fail the probe
permanently instead of the deferred probing. Switch to propagating the error
codes upstream.  Since commit ce753ad1549c ("platform: finally disallow IRQ0
in platform_get_irq() and its ilk") IRQ0 is no longer returned by those APIs,
so we now can safely ignore it...

Fixes: 2408a08583d ("mmc: sunxi-mmc: Handle return value of platform_get_irq")
Cc: stable@vger.kernel.org # v5.19+
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
---
Changes in version 3:
- added the platform_get_irq() commit reference to the  patch description and
  the Cc: tag marking the 1st kernel version containing it;
- added Jernej's tag.

Changes in version 2:
- slightly reformatted the patch description.

 drivers/mmc/host/sunxi-mmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index 3db9f32d6a7b..69dcb8805e05 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -1350,8 +1350,8 @@ static int sunxi_mmc_resource_request(struct sunxi_mmc_host *host,
 		return ret;
 
 	host->irq = platform_get_irq(pdev, 0);
-	if (host->irq <= 0) {
-		ret = -EINVAL;
+	if (host->irq < 0) {
+		ret = host->irq;
 		goto error_disable_mmc;
 	}
 
-- 
2.26.3


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2023-06-17 20:52 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-17 20:36 [PATCH v3 00/12] Fix deferred probing in the MMC/SD drivers Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 01/12] mmc: bcm2835: fix deferred probing Sergey Shtylyov
2023-06-17 20:36   ` Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 02/12] mmc: meson-gx: " Sergey Shtylyov
2023-06-17 20:36   ` Sergey Shtylyov
2023-06-17 20:36   ` Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 03/12] mmc: mtk-sd: " Sergey Shtylyov
2023-06-17 20:36   ` Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 04/12] mmc: mvsdio: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 05/12] mmc: omap: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 06/12] mmc: omap_hsmmc: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 07/12] mmc: owl: " Sergey Shtylyov
2023-06-17 20:36   ` Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 08/12] mmc: sdhci-acpi: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 09/12] mmc: sdhci-spear: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 10/12] mmc: sh_mmcif: " Sergey Shtylyov
2023-06-17 20:36 ` Sergey Shtylyov [this message]
2023-06-17 20:36   ` [PATCH v3 11/12] mmc: sunxi: " Sergey Shtylyov
2023-06-17 20:36 ` [PATCH v3 12/12] mmc: usdhi60rol0: " Sergey Shtylyov
2023-06-19 11:43 ` [PATCH v3 00/12] Fix deferred probing in the MMC/SD drivers Ulf Hansson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230617203622.6812-12-s.shtylyov@omp.ru \
    --to=s.shtylyov@omp.ru \
    --cc=jernej.skrabec@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-sunxi@lists.linux.dev \
    --cc=samuel@sholland.org \
    --cc=stable@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    --cc=wens@csie.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.