On Thu, Jul 14, 2022 at 06:45:27PM -0700, Max Filippov wrote:
On Thu, Jul 14, 2022 at 2:47 PM Stafford Horne <shorne@xxxxxxxxx> wrote:
The generic pci.h header provides a definition of pci_get_legacy_ide_irq
which is used by architectures that use PC-style interrupt numbers.
This patch removes the old pci.h in order to make room for a new
pci.h to be used by arm64, riscv, openrisc, etc.
The existing code in pci.h is moved out to architectures.
Suggested-by: Arnd Bergmann <arnd@xxxxxxxx>
Link: https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@xxxxxxxxxxxxxx/
Signed-off-by: Stafford Horne <shorne@xxxxxxxxx>
---
arch/alpha/include/asm/pci.h | 1 -
arch/ia64/include/asm/pci.h | 1 -
arch/m68k/include/asm/pci.h | 7 +++++--
arch/powerpc/include/asm/pci.h | 1 -
arch/s390/include/asm/pci.h | 6 +++++-
arch/sparc/include/asm/pci.h | 5 ++++-
arch/x86/include/asm/pci.h | 6 ++++--
arch/xtensa/include/asm/pci.h | 6 ++++--
include/asm-generic/pci.h | 17 -----------------
9 files changed, 22 insertions(+), 28 deletions(-)
delete mode 100644 include/asm-generic/pci.h
[...]
diff --git a/arch/xtensa/include/asm/pci.h b/arch/xtensa/include/asm/pci.h
index 8e2b48a268db..f57ede61f5db 100644
--- a/arch/xtensa/include/asm/pci.h
+++ b/arch/xtensa/include/asm/pci.h
@@ -43,7 +43,9 @@
#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1
#define arch_can_pci_mmap_io() 1
-/* Generic PCI */
-#include <asm-generic/pci.h>
Ok.
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+ return channel ? 15 : 14;
+}
This addition does not make sense for the xtensa as it isn't even possible
to enable PNP support (the only user of this function) on xtensa.
Thanks for your feedback, this is the kind of feedback I was hoping to fish out
with this patch. I will look into completely removing this then.
-Stafford
