From b93d2d7c38bc98cee49c76acc7523b43cb4f25f7 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Sat, 6 May 2023 07:04:15 +0200 Subject: [PATCH] ath79: 5.15: drop unused res variable from pci ar724x OF convert patch Drop unused res variable from pci ar724x OF convert patch fixing compilation warning: arch/mips/pci/pci-ar724x.c: In function 'ar724x_pci_probe': arch/mips/pci/pci-ar724x.c:387:26: error: unused variable 'res' [-Werror=unused-variable] 387 | struct resource *res; | ^~~ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi --- .../0020-MIPS-pci-ar724x-convert-to-OF.patch | 12 ++++++++++-- ...-MIPS-pci-ar724x-add-QCA9550-reset-sequence.patch | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/target/linux/ath79/patches-5.15/0020-MIPS-pci-ar724x-convert-to-OF.patch b/target/linux/ath79/patches-5.15/0020-MIPS-pci-ar724x-convert-to-OF.patch index 2772c53392..7927c1cbf5 100644 --- a/target/linux/ath79/patches-5.15/0020-MIPS-pci-ar724x-convert-to-OF.patch +++ b/target/linux/ath79/patches-5.15/0020-MIPS-pci-ar724x-convert-to-OF.patch @@ -154,7 +154,15 @@ Signed-off-by: John Crispin irq_set_chained_handler_and_data(apc->irq, ar724x_pci_irq_handler, apc); } -@@ -388,29 +396,11 @@ static int ar724x_pci_probe(struct platf +@@ -360,7 +368,6 @@ static void ar724x_pci_hw_init(struct ar + static int ar724x_pci_probe(struct platform_device *pdev) + { + struct ar724x_pci_controller *apc; +- struct resource *res; + int id; + + id = pdev->id; +@@ -388,29 +395,11 @@ static int ar724x_pci_probe(struct platf if (apc->irq < 0) return -EINVAL; @@ -186,7 +194,7 @@ Signed-off-by: John Crispin /* * Do the full PCIE Root Complex Initialization Sequence if the PCIe -@@ -432,10 +422,16 @@ static int ar724x_pci_probe(struct platf +@@ -432,10 +421,16 @@ static int ar724x_pci_probe(struct platf return 0; } diff --git a/target/linux/ath79/patches-5.15/0062-MIPS-pci-ar724x-add-QCA9550-reset-sequence.patch b/target/linux/ath79/patches-5.15/0062-MIPS-pci-ar724x-add-QCA9550-reset-sequence.patch index f596ddb733..1949a9f886 100644 --- a/target/linux/ath79/patches-5.15/0062-MIPS-pci-ar724x-add-QCA9550-reset-sequence.patch +++ b/target/linux/ath79/patches-5.15/0062-MIPS-pci-ar724x-add-QCA9550-reset-sequence.patch @@ -96,7 +96,7 @@ Signed-off-by: David Bauer /* set PCIE Application Control to ready */ app = __raw_readl(apc->ctrl_base + AR724X_PCI_REG_APP); -@@ -396,6 +412,14 @@ static int ar724x_pci_probe(struct platf +@@ -395,6 +411,14 @@ static int ar724x_pci_probe(struct platf if (apc->irq < 0) return -EINVAL; @@ -111,7 +111,7 @@ Signed-off-by: David Bauer apc->np = pdev->dev.of_node; apc->pci_controller.pci_ops = &ar724x_pci_ops; apc->pci_controller.io_resource = &apc->io_res; -@@ -406,7 +430,7 @@ static int ar724x_pci_probe(struct platf +@@ -405,7 +429,7 @@ static int ar724x_pci_probe(struct platf * Do the full PCIE Root Complex Initialization Sequence if the PCIe * host controller is in reset. */ @@ -120,7 +120,7 @@ Signed-off-by: David Bauer ar724x_pci_hw_init(apc); apc->link_up = ar724x_pci_check_link(apc); -@@ -424,6 +448,7 @@ static int ar724x_pci_probe(struct platf +@@ -423,6 +447,7 @@ static int ar724x_pci_probe(struct platf static const struct of_device_id ar724x_pci_ids[] = { { .compatible = "qcom,ar7240-pci" }, -- 2.30.2