From: Greg Kroah-Hartman Date: Thu, 7 Nov 2024 06:32:02 +0000 (+0100) Subject: fix up build error in 4.19 and 5.4 X-Git-Tag: v4.19.323~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af490482bc73e04df3214bc21d06b4bf8b13cc9c;p=thirdparty%2Fkernel%2Fstable-queue.git fix up build error in 4.19 and 5.4 --- diff --git a/queue-4.19/pinctrl-mvebu-fix-devinit_dove_pinctrl_probe-functio.patch b/queue-4.19/pinctrl-mvebu-fix-devinit_dove_pinctrl_probe-functio.patch index 3ce8a356440..fb4b6f28178 100644 --- a/queue-4.19/pinctrl-mvebu-fix-devinit_dove_pinctrl_probe-functio.patch +++ b/queue-4.19/pinctrl-mvebu-fix-devinit_dove_pinctrl_probe-functio.patch @@ -18,14 +18,12 @@ Link: https://lore.kernel.org/20240829064823.19808-1-wangjianzheng@vivo.com Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- - drivers/pinctrl/mvebu/pinctrl-dove.c | 42 +++++++++++++++++++--------- + drivers/pinctrl/mvebu/pinctrl-dove.c | 42 ++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 13 deletions(-) -diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c -index 2c5032d0def52..8a77289fe96fb 100644 --- a/drivers/pinctrl/mvebu/pinctrl-dove.c +++ b/drivers/pinctrl/mvebu/pinctrl-dove.c -@@ -773,7 +773,7 @@ static int dove_pinctrl_probe(struct platform_device *pdev) +@@ -773,7 +773,7 @@ static int dove_pinctrl_probe(struct pla of_match_device(dove_pinctrl_of_match, &pdev->dev); struct mvebu_mpp_ctrl_data *mpp_data; void __iomem *base; @@ -34,10 +32,10 @@ index 2c5032d0def52..8a77289fe96fb 100644 pdev->dev.platform_data = (void *)match->data; -@@ -789,13 +789,17 @@ static int dove_pinctrl_probe(struct platform_device *pdev) - clk_prepare_enable(clk); +@@ -790,13 +790,17 @@ static int dove_pinctrl_probe(struct pla - base = devm_platform_get_and_ioremap_resource(pdev, 0, &mpp_res); + mpp_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + base = devm_ioremap_resource(&pdev->dev, mpp_res); - if (IS_ERR(base)) - return PTR_ERR(base); + if (IS_ERR(base)) { @@ -56,7 +54,7 @@ index 2c5032d0def52..8a77289fe96fb 100644 dove_pinctrl_info.control_data = mpp_data; for (i = 0; i < ARRAY_SIZE(dove_mpp_controls); i++) -@@ -814,8 +818,10 @@ static int dove_pinctrl_probe(struct platform_device *pdev) +@@ -815,8 +819,10 @@ static int dove_pinctrl_probe(struct pla } mpp4_base = devm_ioremap_resource(&pdev->dev, res); @@ -69,7 +67,7 @@ index 2c5032d0def52..8a77289fe96fb 100644 res = platform_get_resource(pdev, IORESOURCE_MEM, 2); if (!res) { -@@ -826,8 +832,10 @@ static int dove_pinctrl_probe(struct platform_device *pdev) +@@ -827,8 +833,10 @@ static int dove_pinctrl_probe(struct pla } pmu_base = devm_ioremap_resource(&pdev->dev, res); @@ -82,7 +80,7 @@ index 2c5032d0def52..8a77289fe96fb 100644 gconfmap = syscon_regmap_lookup_by_compatible("marvell,dove-global-config"); if (IS_ERR(gconfmap)) { -@@ -837,12 +845,17 @@ static int dove_pinctrl_probe(struct platform_device *pdev) +@@ -838,12 +846,17 @@ static int dove_pinctrl_probe(struct pla adjust_resource(&fb_res, (mpp_res->start & INT_REGS_MASK) + GC_REGS_OFFS, 0x14); gc_base = devm_ioremap_resource(&pdev->dev, &fb_res); @@ -104,7 +102,7 @@ index 2c5032d0def52..8a77289fe96fb 100644 } /* Warn on any missing DT resource */ -@@ -850,6 +863,9 @@ static int dove_pinctrl_probe(struct platform_device *pdev) +@@ -851,6 +864,9 @@ static int dove_pinctrl_probe(struct pla dev_warn(&pdev->dev, FW_BUG "Missing pinctrl regs in DTB. Please update your firmware.\n"); return mvebu_pinctrl_probe(pdev); @@ -114,6 +112,3 @@ index 2c5032d0def52..8a77289fe96fb 100644 } static struct platform_driver dove_pinctrl_driver = { --- -2.43.0 - diff --git a/queue-4.19/pinctrl-mvebu-use-devm_platform_get_and_ioremap_reso.patch b/queue-4.19/pinctrl-mvebu-use-devm_platform_get_and_ioremap_reso.patch deleted file mode 100644 index 5322aa725ab..00000000000 --- a/queue-4.19/pinctrl-mvebu-use-devm_platform_get_and_ioremap_reso.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f4443a86b2b810be51520a56ebb036fc335bdecf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 4 Jul 2023 20:47:40 +0800 -Subject: pinctrl: mvebu: Use devm_platform_get_and_ioremap_resource() - -From: Yangtao Li - -[ Upstream commit 2d357f25663ddfef47ffe26da21155302153d168 ] - -Convert platform_get_resource(), devm_ioremap_resource() to a single -call to devm_platform_get_and_ioremap_resource(), as this is exactly -what this function does. - -Signed-off-by: Yangtao Li -Link: https://lore.kernel.org/r/20230704124742.9596-2-frank.li@vivo.com -Signed-off-by: Linus Walleij -Stable-dep-of: c25478419f6f ("pinctrl: mvebu: Fix devinit_dove_pinctrl_probe function") -Signed-off-by: Sasha Levin ---- - drivers/pinctrl/mvebu/pinctrl-dove.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c -index 8472f61f2bbe7..2c5032d0def52 100644 ---- a/drivers/pinctrl/mvebu/pinctrl-dove.c -+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c -@@ -788,8 +788,7 @@ static int dove_pinctrl_probe(struct platform_device *pdev) - } - clk_prepare_enable(clk); - -- mpp_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -- base = devm_ioremap_resource(&pdev->dev, mpp_res); -+ base = devm_platform_get_and_ioremap_resource(pdev, 0, &mpp_res); - if (IS_ERR(base)) - return PTR_ERR(base); - --- -2.43.0 - diff --git a/queue-4.19/series b/queue-4.19/series index cb1b528861a..40e10cfa350 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -86,7 +86,6 @@ pci-xilinx-nwl-fix-register-misspelling.patch rdma-iwcm-fix-warning-at_kernel-workqueue.c-check_fl.patch pinctrl-single-fix-missing-error-code-in-pcs_probe.patch clk-ti-dra7-atl-fix-leak-of-of_nodes.patch -pinctrl-mvebu-use-devm_platform_get_and_ioremap_reso.patch pinctrl-mvebu-fix-devinit_dove_pinctrl_probe-functio.patch rdma-cxgb4-added-null-check-for-lookup_atid.patch ntb-intel-fix-the-null-vs-is_err-bug-for-debugfs_cre.patch diff --git a/queue-5.4/pinctrl-mvebu-fix-devinit_dove_pinctrl_probe-functio.patch b/queue-5.4/pinctrl-mvebu-fix-devinit_dove_pinctrl_probe-functio.patch index afe311b30bc..43596f75589 100644 --- a/queue-5.4/pinctrl-mvebu-fix-devinit_dove_pinctrl_probe-functio.patch +++ b/queue-5.4/pinctrl-mvebu-fix-devinit_dove_pinctrl_probe-functio.patch @@ -1,4 +1,4 @@ -From 104c3c70af958b68428c57ff395de99e48ad2fc2 Mon Sep 17 00:00:00 2001 +From 4984dff1d9139b1993503fb5f1ef48c0eecf9c3b Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Thu, 29 Aug 2024 14:48:23 +0800 Subject: pinctrl: mvebu: Fix devinit_dove_pinctrl_probe function @@ -18,14 +18,12 @@ Link: https://lore.kernel.org/20240829064823.19808-1-wangjianzheng@vivo.com Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- - drivers/pinctrl/mvebu/pinctrl-dove.c | 42 +++++++++++++++++++--------- + drivers/pinctrl/mvebu/pinctrl-dove.c | 42 ++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 13 deletions(-) -diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c -index bd74daa9ed666..c84326dfe371c 100644 --- a/drivers/pinctrl/mvebu/pinctrl-dove.c +++ b/drivers/pinctrl/mvebu/pinctrl-dove.c -@@ -769,7 +769,7 @@ static int dove_pinctrl_probe(struct platform_device *pdev) +@@ -769,7 +769,7 @@ static int dove_pinctrl_probe(struct pla of_match_device(dove_pinctrl_of_match, &pdev->dev); struct mvebu_mpp_ctrl_data *mpp_data; void __iomem *base; @@ -34,10 +32,10 @@ index bd74daa9ed666..c84326dfe371c 100644 pdev->dev.platform_data = (void *)match->data; -@@ -785,13 +785,17 @@ static int dove_pinctrl_probe(struct platform_device *pdev) - clk_prepare_enable(clk); +@@ -786,13 +786,17 @@ static int dove_pinctrl_probe(struct pla - base = devm_platform_get_and_ioremap_resource(pdev, 0, &mpp_res); + mpp_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + base = devm_ioremap_resource(&pdev->dev, mpp_res); - if (IS_ERR(base)) - return PTR_ERR(base); + if (IS_ERR(base)) { @@ -56,7 +54,7 @@ index bd74daa9ed666..c84326dfe371c 100644 dove_pinctrl_info.control_data = mpp_data; for (i = 0; i < ARRAY_SIZE(dove_mpp_controls); i++) -@@ -810,8 +814,10 @@ static int dove_pinctrl_probe(struct platform_device *pdev) +@@ -811,8 +815,10 @@ static int dove_pinctrl_probe(struct pla } mpp4_base = devm_ioremap_resource(&pdev->dev, res); @@ -69,7 +67,7 @@ index bd74daa9ed666..c84326dfe371c 100644 res = platform_get_resource(pdev, IORESOURCE_MEM, 2); if (!res) { -@@ -822,8 +828,10 @@ static int dove_pinctrl_probe(struct platform_device *pdev) +@@ -823,8 +829,10 @@ static int dove_pinctrl_probe(struct pla } pmu_base = devm_ioremap_resource(&pdev->dev, res); @@ -82,7 +80,7 @@ index bd74daa9ed666..c84326dfe371c 100644 gconfmap = syscon_regmap_lookup_by_compatible("marvell,dove-global-config"); if (IS_ERR(gconfmap)) { -@@ -833,12 +841,17 @@ static int dove_pinctrl_probe(struct platform_device *pdev) +@@ -834,12 +842,17 @@ static int dove_pinctrl_probe(struct pla adjust_resource(&fb_res, (mpp_res->start & INT_REGS_MASK) + GC_REGS_OFFS, 0x14); gc_base = devm_ioremap_resource(&pdev->dev, &fb_res); @@ -104,7 +102,7 @@ index bd74daa9ed666..c84326dfe371c 100644 } /* Warn on any missing DT resource */ -@@ -846,6 +859,9 @@ static int dove_pinctrl_probe(struct platform_device *pdev) +@@ -847,6 +860,9 @@ static int dove_pinctrl_probe(struct pla dev_warn(&pdev->dev, FW_BUG "Missing pinctrl regs in DTB. Please update your firmware.\n"); return mvebu_pinctrl_probe(pdev); @@ -114,6 +112,3 @@ index bd74daa9ed666..c84326dfe371c 100644 } static struct platform_driver dove_pinctrl_driver = { --- -2.43.0 - diff --git a/queue-5.4/pinctrl-mvebu-use-devm_platform_get_and_ioremap_reso.patch b/queue-5.4/pinctrl-mvebu-use-devm_platform_get_and_ioremap_reso.patch deleted file mode 100644 index d776222974a..00000000000 --- a/queue-5.4/pinctrl-mvebu-use-devm_platform_get_and_ioremap_reso.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8ddcdda372eafc7eb01c16a62116a56cb68a57a8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 4 Jul 2023 20:47:40 +0800 -Subject: pinctrl: mvebu: Use devm_platform_get_and_ioremap_resource() - -From: Yangtao Li - -[ Upstream commit 2d357f25663ddfef47ffe26da21155302153d168 ] - -Convert platform_get_resource(), devm_ioremap_resource() to a single -call to devm_platform_get_and_ioremap_resource(), as this is exactly -what this function does. - -Signed-off-by: Yangtao Li -Link: https://lore.kernel.org/r/20230704124742.9596-2-frank.li@vivo.com -Signed-off-by: Linus Walleij -Stable-dep-of: c25478419f6f ("pinctrl: mvebu: Fix devinit_dove_pinctrl_probe function") -Signed-off-by: Sasha Levin ---- - drivers/pinctrl/mvebu/pinctrl-dove.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c -index 545486d98532d..bd74daa9ed666 100644 ---- a/drivers/pinctrl/mvebu/pinctrl-dove.c -+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c -@@ -784,8 +784,7 @@ static int dove_pinctrl_probe(struct platform_device *pdev) - } - clk_prepare_enable(clk); - -- mpp_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -- base = devm_ioremap_resource(&pdev->dev, mpp_res); -+ base = devm_platform_get_and_ioremap_resource(pdev, 0, &mpp_res); - if (IS_ERR(base)) - return PTR_ERR(base); - --- -2.43.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 20c5f121b29..3eb3863a1fb 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -113,7 +113,6 @@ pci-xilinx-nwl-fix-register-misspelling.patch rdma-iwcm-fix-warning-at_kernel-workqueue.c-check_fl.patch pinctrl-single-fix-missing-error-code-in-pcs_probe.patch clk-ti-dra7-atl-fix-leak-of-of_nodes.patch -pinctrl-mvebu-use-devm_platform_get_and_ioremap_reso.patch pinctrl-mvebu-fix-devinit_dove_pinctrl_probe-functio.patch watchdog-imx_sc_wdt-don-t-disable-wdt-in-suspend.patch rdma-hns-optimize-hem-allocation-performance.patch