From: Christian Marangi Date: Sat, 6 May 2023 01:21:48 +0000 (+0200) Subject: ath79: 5.15: drop unused res variable from pci ar71xx OF convert patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=40c742908373171b70589b595c3c0587139f4ecd;p=openwrt%2Fstaging%2Fthess.git ath79: 5.15: drop unused res variable from pci ar71xx OF convert patch Drop unused res variable from pci ar71xx OF convert patch fixing compilation warning: arch/mips/pci/pci-ar71xx.c: In function 'ar71xx_pci_probe': arch/mips/pci/pci-ar71xx.c:287:26: error: unused variable 'res' [-Werror=unused-variable] 287 | struct resource *res; | ^~~ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi --- diff --git a/target/linux/ath79/patches-5.15/0018-MIPS-pci-ar71xx-convert-to-OF.patch b/target/linux/ath79/patches-5.15/0018-MIPS-pci-ar71xx-convert-to-OF.patch index e600a4f0d9..9a315aed0b 100644 --- a/target/linux/ath79/patches-5.15/0018-MIPS-pci-ar71xx-convert-to-OF.patch +++ b/target/linux/ath79/patches-5.15/0018-MIPS-pci-ar71xx-convert-to-OF.patch @@ -141,7 +141,7 @@ Signed-off-by: John Crispin irq_set_chained_handler_and_data(apc->irq, ar71xx_pci_irq_handler, apc); } -@@ -325,6 +337,11 @@ static void ar71xx_pci_reset(void) +@@ -325,10 +337,14 @@ static void ar71xx_pci_reset(void) mdelay(100); } @@ -153,7 +153,11 @@ Signed-off-by: John Crispin static int ar71xx_pci_probe(struct platform_device *pdev) { struct ar71xx_pci_controller *apc; -@@ -345,26 +362,6 @@ static int ar71xx_pci_probe(struct platf +- struct resource *res; + u32 t; + + apc = devm_kzalloc(&pdev->dev, sizeof(struct ar71xx_pci_controller), +@@ -345,26 +361,6 @@ static int ar71xx_pci_probe(struct platf if (apc->irq < 0) return -EINVAL; @@ -180,7 +184,7 @@ Signed-off-by: John Crispin ar71xx_pci_reset(); /* setup COMMAND register */ -@@ -377,9 +374,11 @@ static int ar71xx_pci_probe(struct platf +@@ -377,9 +373,11 @@ static int ar71xx_pci_probe(struct platf ar71xx_pci_irq_init(apc); @@ -192,7 +196,7 @@ Signed-off-by: John Crispin register_pci_controller(&apc->pci_ctrl); -@@ -390,6 +389,7 @@ static struct platform_driver ar71xx_pci +@@ -390,6 +388,7 @@ static struct platform_driver ar71xx_pci .probe = ar71xx_pci_probe, .driver = { .name = "ar71xx-pci", diff --git a/target/linux/ath79/patches-5.15/0036-MIPS-ath79-remove-irq-code-from-pci.patch b/target/linux/ath79/patches-5.15/0036-MIPS-ath79-remove-irq-code-from-pci.patch index 4732d1b2c8..01549eec68 100644 --- a/target/linux/ath79/patches-5.15/0036-MIPS-ath79-remove-irq-code-from-pci.patch +++ b/target/linux/ath79/patches-5.15/0036-MIPS-ath79-remove-irq-code-from-pci.patch @@ -127,7 +127,7 @@ Submitted-by: John Crispin static void ar71xx_pci_reset(void) { ath79_device_reset_set(AR71XX_RESET_PCI_BUS | AR71XX_RESET_PCI_CORE); -@@ -358,10 +258,6 @@ static int ar71xx_pci_probe(struct platf +@@ -357,10 +257,6 @@ static int ar71xx_pci_probe(struct platf if (IS_ERR(apc->cfg_base)) return PTR_ERR(apc->cfg_base); @@ -138,7 +138,7 @@ Submitted-by: John Crispin ar71xx_pci_reset(); /* setup COMMAND register */ -@@ -372,8 +268,6 @@ static int ar71xx_pci_probe(struct platf +@@ -371,8 +267,6 @@ static int ar71xx_pci_probe(struct platf /* clear bus errors */ ar71xx_pci_check_error(apc, 1); diff --git a/target/linux/ath79/patches-5.15/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch b/target/linux/ath79/patches-5.15/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch index 3b8fee2269..1e2715b84c 100644 --- a/target/linux/ath79/patches-5.15/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch +++ b/target/linux/ath79/patches-5.15/470-MIPS-ath79-swizzle-pci-address-for-ar71xx.patch @@ -97,7 +97,7 @@ SVN-Revision: 32639 static inline u32 ar71xx_pci_get_ble(int where, int size, int local) { u32 t; -@@ -276,6 +315,9 @@ static int ar71xx_pci_probe(struct platf +@@ -275,6 +314,9 @@ static int ar71xx_pci_probe(struct platf register_pci_controller(&apc->pci_ctrl);