From: Sasha Levin Date: Fri, 18 Aug 2023 00:42:17 +0000 (-0400) Subject: Drop mmc-sdhci-spear-fix-deferred-probing.patch X-Git-Tag: v6.4.12~96 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e47fbe719e109a72adaa9eed07746bd81c284ed5;p=thirdparty%2Fkernel%2Fstable-queue.git Drop mmc-sdhci-spear-fix-deferred-probing.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/mmc-sdhci-spear-fix-deferred-probing.patch b/queue-4.19/mmc-sdhci-spear-fix-deferred-probing.patch deleted file mode 100644 index 04b19a8e4c1..00000000000 --- a/queue-4.19/mmc-sdhci-spear-fix-deferred-probing.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4e092284044f9ae0209daad56be089aa2238cae4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 17 Jun 2023 23:36:19 +0300 -Subject: mmc: sdhci-spear: fix deferred probing - -From: Sergey Shtylyov - -[ Upstream commit 8d0caeedcd05a721f3cc2537b0ea212ec4027307 ] - -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: 682798a596a6 ("mmc: sdhci-spear: Handle return value of platform_get_irq") -Cc: stable@vger.kernel.org # v5.19+ -Signed-off-by: Sergey Shtylyov -Acked-by: Viresh Kumar -Acked-by: Adrian Hunter -Link: https://lore.kernel.org/r/20230617203622.6812-10-s.shtylyov@omp.ru -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/host/sdhci-spear.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c -index 9247d51f2eed2..705cc51861599 100644 ---- a/drivers/mmc/host/sdhci-spear.c -+++ b/drivers/mmc/host/sdhci-spear.c -@@ -82,8 +82,8 @@ static int sdhci_probe(struct platform_device *pdev) - host->hw_name = "sdhci"; - host->ops = &sdhci_pltfm_ops; - host->irq = platform_get_irq(pdev, 0); -- if (host->irq <= 0) { -- ret = -EINVAL; -+ if (host->irq < 0) { -+ ret = host->irq; - goto err_host; - } - host->quirks = SDHCI_QUIRK_BROKEN_ADMA; --- -2.40.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 6f1777a14f9..cef3aca40b2 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -35,7 +35,6 @@ usb-dwc3-qcom-add-helper-functions-to-enable-disable.patch usb-dwc3-qcom-fix-null-deref-on-suspend.patch mmc-meson-gx-remove-useless-lock.patch mmc-meson-gx-remove-redundant-mmc_request_done-call-.patch -mmc-sdhci-spear-fix-deferred-probing.patch mmc-tmio-replace-tmio_mmc_clk_stop-calls-with-tmio_m.patch mmc-tmio-move-tmio_mmc_set_clock-to-platform-hook.patch mmc-uniphier-sd-add-uniphier-sd-emmc-controller-driv.patch diff --git a/queue-5.10/mmc-sdhci-spear-fix-deferred-probing.patch b/queue-5.10/mmc-sdhci-spear-fix-deferred-probing.patch deleted file mode 100644 index 28648516a93..00000000000 --- a/queue-5.10/mmc-sdhci-spear-fix-deferred-probing.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2fbe19a7beef7514ea9bdafdb10fbd77f66ea4b3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 17 Jun 2023 23:36:19 +0300 -Subject: mmc: sdhci-spear: fix deferred probing - -From: Sergey Shtylyov - -[ Upstream commit 8d0caeedcd05a721f3cc2537b0ea212ec4027307 ] - -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: 682798a596a6 ("mmc: sdhci-spear: Handle return value of platform_get_irq") -Cc: stable@vger.kernel.org # v5.19+ -Signed-off-by: Sergey Shtylyov -Acked-by: Viresh Kumar -Acked-by: Adrian Hunter -Link: https://lore.kernel.org/r/20230617203622.6812-10-s.shtylyov@omp.ru -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/host/sdhci-spear.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c -index d463e2fd5b1a8..c79035727b20b 100644 ---- a/drivers/mmc/host/sdhci-spear.c -+++ b/drivers/mmc/host/sdhci-spear.c -@@ -65,8 +65,8 @@ static int sdhci_probe(struct platform_device *pdev) - host->hw_name = "sdhci"; - host->ops = &sdhci_pltfm_ops; - host->irq = platform_get_irq(pdev, 0); -- if (host->irq <= 0) { -- ret = -EINVAL; -+ if (host->irq < 0) { -+ ret = host->irq; - goto err_host; - } - host->quirks = SDHCI_QUIRK_BROKEN_ADMA; --- -2.40.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 23066ce2c42..e82c0fdd99b 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -60,7 +60,6 @@ phy-qcom-qmp-create-copies-of-qmp-phy-driver.patch phy-qcom-qmp-combo-fix-init-count-imbalance.patch phy-qcom-qmp-pcie-msm8996-fix-init-count-imbalance.patch usb-dwc3-qcom-fix-null-deref-on-suspend.patch -mmc-sdhci-spear-fix-deferred-probing.patch mmc-bcm2835-fix-deferred-probing.patch mmc-sunxi-fix-deferred-probing.patch mmc-core-add-devm_mmc_alloc_host.patch diff --git a/queue-5.15/mmc-sdhci-spear-fix-deferred-probing.patch b/queue-5.15/mmc-sdhci-spear-fix-deferred-probing.patch deleted file mode 100644 index 3e5c50834b5..00000000000 --- a/queue-5.15/mmc-sdhci-spear-fix-deferred-probing.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 06fb398c032bd2317c2f2fdffd455c3e052265ca Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 17 Jun 2023 23:36:19 +0300 -Subject: mmc: sdhci-spear: fix deferred probing - -From: Sergey Shtylyov - -[ Upstream commit 8d0caeedcd05a721f3cc2537b0ea212ec4027307 ] - -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: 682798a596a6 ("mmc: sdhci-spear: Handle return value of platform_get_irq") -Cc: stable@vger.kernel.org # v5.19+ -Signed-off-by: Sergey Shtylyov -Acked-by: Viresh Kumar -Acked-by: Adrian Hunter -Link: https://lore.kernel.org/r/20230617203622.6812-10-s.shtylyov@omp.ru -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/host/sdhci-spear.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c -index d463e2fd5b1a8..c79035727b20b 100644 ---- a/drivers/mmc/host/sdhci-spear.c -+++ b/drivers/mmc/host/sdhci-spear.c -@@ -65,8 +65,8 @@ static int sdhci_probe(struct platform_device *pdev) - host->hw_name = "sdhci"; - host->ops = &sdhci_pltfm_ops; - host->irq = platform_get_irq(pdev, 0); -- if (host->irq <= 0) { -- ret = -EINVAL; -+ if (host->irq < 0) { -+ ret = host->irq; - goto err_host; - } - host->quirks = SDHCI_QUIRK_BROKEN_ADMA; --- -2.40.1 - diff --git a/queue-5.15/series b/queue-5.15/series index dbeff821b41..5ce4bd06726 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -63,7 +63,6 @@ tty-serial-fsl_lpuart-make-rx_watermark-configurable.patch tty-serial-fsl_lpuart-reduce-rx-watermark-to-0-on-ls.patch usb-dwc3-qcom-fix-null-deref-on-suspend.patch usb-dwc3-fix-use-after-free-on-core-driver-unbind.patch -mmc-sdhci-spear-fix-deferred-probing.patch mmc-bcm2835-fix-deferred-probing.patch mmc-sunxi-fix-deferred-probing.patch net-ncsi-change-from-ndo_set_mac_address-to-dev_set_.patch diff --git a/queue-5.4/mmc-sdhci-spear-fix-deferred-probing.patch b/queue-5.4/mmc-sdhci-spear-fix-deferred-probing.patch deleted file mode 100644 index 8deb1804a61..00000000000 --- a/queue-5.4/mmc-sdhci-spear-fix-deferred-probing.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f07d3f321e9bbfe86fc2fe73763fec06bc79487b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 17 Jun 2023 23:36:19 +0300 -Subject: mmc: sdhci-spear: fix deferred probing - -From: Sergey Shtylyov - -[ Upstream commit 8d0caeedcd05a721f3cc2537b0ea212ec4027307 ] - -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: 682798a596a6 ("mmc: sdhci-spear: Handle return value of platform_get_irq") -Cc: stable@vger.kernel.org # v5.19+ -Signed-off-by: Sergey Shtylyov -Acked-by: Viresh Kumar -Acked-by: Adrian Hunter -Link: https://lore.kernel.org/r/20230617203622.6812-10-s.shtylyov@omp.ru -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/host/sdhci-spear.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c -index 916b5b09c3d13..05daae3676f00 100644 ---- a/drivers/mmc/host/sdhci-spear.c -+++ b/drivers/mmc/host/sdhci-spear.c -@@ -67,8 +67,8 @@ static int sdhci_probe(struct platform_device *pdev) - host->hw_name = "sdhci"; - host->ops = &sdhci_pltfm_ops; - host->irq = platform_get_irq(pdev, 0); -- if (host->irq <= 0) { -- ret = -EINVAL; -+ if (host->irq < 0) { -+ ret = host->irq; - goto err_host; - } - host->quirks = SDHCI_QUIRK_BROKEN_ADMA; --- -2.40.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 47c64a30c1e..796dd06c29f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -43,7 +43,6 @@ interconnect-move-internal-structs-into-a-separate-f.patch interconnect-add-helpers-for-enabling-disabling-a-pa.patch usb-dwc3-qcom-add-helper-functions-to-enable-disable.patch usb-dwc3-qcom-fix-null-deref-on-suspend.patch -mmc-sdhci-spear-fix-deferred-probing.patch mmc-bcm2835-fix-deferred-probing.patch mmc-sunxi-fix-deferred-probing.patch leds-trigger-netdev-recheck-netdev_led_mode_linkup-o.patch