From dce9fdf8b2c2c1f74b1913845acf56bd86d91f22 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 20 Sep 2021 11:06:11 +0200 Subject: [PATCH] drop queue-5.14/parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch --- ...version-only-when-config_pci-enabled.patch | 94 ------------------- queue-5.14/series | 1 - 2 files changed, 95 deletions(-) delete mode 100644 queue-5.14/parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch diff --git a/queue-5.14/parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch b/queue-5.14/parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch deleted file mode 100644 index 53d86f2f954..00000000000 --- a/queue-5.14/parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 9caea0007601d3bc6debec04f8b4cd6f4c2394be Mon Sep 17 00:00:00 2001 -From: Helge Deller -Date: Sun, 19 Sep 2021 10:36:09 -0700 -Subject: parisc: Declare pci_iounmap() parisc version only when CONFIG_PCI enabled - -From: Helge Deller - -commit 9caea0007601d3bc6debec04f8b4cd6f4c2394be upstream. - -Linus noticed odd declaration rules for pci_iounmap() in iomap.h and -pci_iomap.h, where it dependend on either NO_GENERIC_PCI_IOPORT_MAP or -GENERIC_IOMAP when CONFIG_PCI was disabled. - -Testing on parisc seems to indicate that we need pci_iounmap() only when -CONFIG_PCI is enabled, so the declaration of pci_iounmap() can be moved -cleanly into pci_iomap.h in sync with the declarations of pci_iomap(). - -Link: https://lore.kernel.org/all/CAHk-=wjRrh98pZoQ+AzfWmsTZacWxTJKXZ9eKU2X_0+jM=O8nw@mail.gmail.com/ -Signed-off-by: Helge Deller -Suggested-by: Linus Torvalds -Fixes: 97a29d59fc22 ("[PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional") -Cc: Arnd Bergmann -Cc: Guenter Roeck -Cc: Ulrich Teichert -Cc: James Bottomley -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman ---- - arch/parisc/lib/iomap.c | 4 +++- - include/asm-generic/iomap.h | 10 ---------- - include/asm-generic/pci_iomap.h | 3 +++ - 3 files changed, 6 insertions(+), 11 deletions(-) - ---- a/arch/parisc/lib/iomap.c -+++ b/arch/parisc/lib/iomap.c -@@ -513,12 +513,15 @@ void ioport_unmap(void __iomem *addr) - } - } - -+#ifdef CONFIG_PCI - void pci_iounmap(struct pci_dev *dev, void __iomem * addr) - { - if (!INDIRECT_ADDR(addr)) { - iounmap(addr); - } - } -+EXPORT_SYMBOL(pci_iounmap); -+#endif - - EXPORT_SYMBOL(ioread8); - EXPORT_SYMBOL(ioread16); -@@ -544,4 +547,3 @@ EXPORT_SYMBOL(iowrite16_rep); - EXPORT_SYMBOL(iowrite32_rep); - EXPORT_SYMBOL(ioport_map); - EXPORT_SYMBOL(ioport_unmap); --EXPORT_SYMBOL(pci_iounmap); ---- a/include/asm-generic/iomap.h -+++ b/include/asm-generic/iomap.h -@@ -110,16 +110,6 @@ static inline void __iomem *ioremap_np(p - } - #endif - --#ifdef CONFIG_PCI --/* Destroy a virtual mapping cookie for a PCI BAR (memory or IO) */ --struct pci_dev; --extern void pci_iounmap(struct pci_dev *dev, void __iomem *); --#elif defined(CONFIG_GENERIC_IOMAP) --struct pci_dev; --static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) --{ } --#endif -- - #include - - #endif ---- a/include/asm-generic/pci_iomap.h -+++ b/include/asm-generic/pci_iomap.h -@@ -18,6 +18,7 @@ extern void __iomem *pci_iomap_range(str - extern void __iomem *pci_iomap_wc_range(struct pci_dev *dev, int bar, - unsigned long offset, - unsigned long maxlen); -+extern void pci_iounmap(struct pci_dev *dev, void __iomem *); - /* Create a virtual mapping cookie for a port on a given PCI device. - * Do not call this directly, it exists to make it easier for architectures - * to override */ -@@ -50,6 +51,8 @@ static inline void __iomem *pci_iomap_wc - { - return NULL; - } -+static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) -+{ } - #endif - - #endif /* __ASM_GENERIC_IO_H */ diff --git a/queue-5.14/series b/queue-5.14/series index 93dc73d2049..963a9637909 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -42,7 +42,6 @@ net-caif-avoid-user-triggerable-warn_on-1.patch ptp-dp83640-don-t-define-page0.patch dccp-don-t-duplicate-ccid-when-cloning-dccp-sock.patch net-l2tp-fix-reference-count-leak-in-l2tp_udp_recv_core.patch -parisc-declare-pci_iounmap-parisc-version-only-when-config_pci-enabled.patch r6040-restore-mdio-clock-frequency-after-mac-reset.patch tipc-increase-timeout-in-tipc_sk_enqueue.patch drm-rockchip-cdn-dp-core-make-cdn_dp_core_resume-__maybe_unused.patch -- 2.47.2