From b24fd1302456c4c4bbd2e7a96053d85e7deed20a Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 13 May 2020 15:01:58 +0200 Subject: [PATCH] lantiq: drop outdated kernel version switches from patches-5.4 This drops some ancient kernel version switches from patches on lantiq target. The patch only adjusts the latest kernel 5.4, as doing it a second time for an older kernel seems a waste of time for a cosmetic change. Signed-off-by: Adrian Schmutzler --- .../0001-MIPS-lantiq-add-pcie-driver.patch | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/target/linux/lantiq/patches-5.4/0001-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-5.4/0001-MIPS-lantiq-add-pcie-driver.patch index bcd928aea9..bd02f0a9f4 100644 --- a/target/linux/lantiq/patches-5.4/0001-MIPS-lantiq-add-pcie-driver.patch +++ b/target/linux/lantiq/patches-5.4/0001-MIPS-lantiq-add-pcie-driver.patch @@ -185,7 +185,7 @@ Signed-off-by: John Crispin } --- /dev/null +++ b/arch/mips/pci/ifxmips_pci_common.h -@@ -0,0 +1,57 @@ +@@ -0,0 +1,53 @@ +/****************************************************************************** +** +** FILE NAME : ifxmips_pci_common.h @@ -226,11 +226,7 @@ Signed-off-by: John Crispin + \ingroup IFX_PCI_COM + \brief PCI/PCIe bus driver common OS header file +*/ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) -+#define IFX_PCI_CONST -+#else +#define IFX_PCI_CONST const -+#endif +#ifdef CONFIG_IFX_PCI +extern int ifx_pci_bios_map_irq(IFX_PCI_CONST struct pci_dev *dev, u8 slot, u8 pin); +extern int ifx_pci_bios_plat_dev_init(struct pci_dev *dev); @@ -1340,7 +1336,7 @@ Signed-off-by: John Crispin + --- /dev/null +++ b/arch/mips/pci/ifxmips_pcie.h -@@ -0,0 +1,135 @@ +@@ -0,0 +1,131 @@ +/****************************************************************************** +** +** FILE NAME : ifxmips_pcie.h @@ -1394,10 +1390,6 @@ Signed-off-by: John Crispin + spin_unlock_irqrestore(&(lock), flags); \ +} while (0) + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) -+#define IRQF_SHARED SA_SHIRQ -+#endif -+ +#define PCIE_MSG_MSI 0x00000001 +#define PCIE_MSG_ISR 0x00000002 +#define PCIE_MSG_FIXUP 0x00000004 @@ -4174,7 +4166,7 @@ Signed-off-by: John Crispin +EXPORT_SYMBOL(pcibios_1st_host_bus_nr); --- /dev/null +++ b/arch/mips/pci/pcie-lantiq.h -@@ -0,0 +1,1305 @@ +@@ -0,0 +1,1301 @@ +/****************************************************************************** +** +** FILE NAME : ifxmips_pcie_reg.h @@ -5185,10 +5177,6 @@ Signed-off-by: John Crispin + spin_unlock_irqrestore(&(lock), flags); \ +} while (0) + -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) -+#define IRQF_SHARED SA_SHIRQ -+#endif -+ +#define PCIE_MSG_MSI 0x00000001 +#define PCIE_MSG_ISR 0x00000002 +#define PCIE_MSG_FIXUP 0x00000004 -- 2.30.2