[PATCH v4 0/3] Cleanups for asm-generic/pci.h

Stafford Horne
2022-07-20T13:19:54Z

When reviewing the OpenRISC PCI support patch Arnd suggested that
we avoid copying arm64 and riscv asm/pci.h and moving that to be
the new asm-generic/pci.h.

This patch does that by first removing the old pci.h with the definition of
pci_get_legacy_ide_irq completely. We replace it with references to
ATA_PRIMARY_IRQ and ATA_SECONDARY_IRQ macros.

Next, we do further cleanups moving isa_dma_bridge_buggy to be only
x86_32 specific. This avoids having to have it in dma.h or pci.h headers.

Next, we create the new pci.h definition.

Note, for the series, I am working on these fixups as part of adding PCI to
OpenRISC. If the series is accepted I would like to merge via the OpenRISC tree
with the OpenRISC PCI support patches to avoid having to coordinate upstream
merges.

Since v3:
- We now completely remove pci_get_legacy_ide_irq and use libata.h macros.
- Added a new patch to remove isa_dma_bridge_buggy in architectures
other than x86_32.
Since v2:
- Remove pci_get_legacy_ide_irq from m68k.
Since v1:
- Remove definition of pci_get_legacy_ide_irq on architectures
not using CONFIG_PNP, which eliminated most.
- Add ifdef around PCIBIOS_MIN_MEM for consistency.

Stafford Horne (3):
PCI: Remove pci_get_legacy_ide_irq and asm-generic/pci.h
PCI: Move isa_dma_bridge_buggy out of dma.h
asm-generic: Add new pci.h and use it

arch/alpha/include/asm/dma.h | 9 ------
arch/alpha/include/asm/pci.h | 6 ----
arch/arc/include/asm/dma.h | 5 ---
arch/arm/include/asm/dma.h | 6 ----
arch/arm/include/asm/pci.h | 5 ---
arch/arm64/include/asm/pci.h | 18 ++---------
arch/csky/include/asm/pci.h | 24 +++-----------
arch/ia64/include/asm/dma.h | 2 --
arch/ia64/include/asm/pci.h | 6 ----
arch/m68k/include/asm/dma.h | 6 ----
arch/m68k/include/asm/pci.h | 2 --
arch/microblaze/include/asm/dma.h | 6 ----
arch/mips/include/asm/dma.h | 8 -----
arch/mips/include/asm/pci.h | 6 ----
arch/parisc/include/asm/dma.h | 6 ----
arch/parisc/include/asm/pci.h | 5 ---
arch/powerpc/include/asm/dma.h | 6 ----
arch/powerpc/include/asm/pci.h | 1 -
arch/riscv/include/asm/pci.h | 25 ++-------------
arch/s390/include/asm/dma.h | 6 ----
arch/s390/include/asm/pci.h | 1 -
arch/sh/include/asm/dma.h | 6 ----
arch/sh/include/asm/pci.h | 6 ----
arch/sparc/include/asm/dma.h | 8 -----
arch/sparc/include/asm/pci.h | 9 ------
arch/um/include/asm/pci.h | 24 ++------------
arch/x86/include/asm/dma.h | 8 -----
arch/x86/include/asm/pci.h | 3 --
arch/xtensa/include/asm/dma.h | 7 -----
arch/xtensa/include/asm/pci.h | 3 --
drivers/comedi/drivers/comedi_isadma.c | 2 +-
drivers/pci/pci.c | 2 ++
drivers/pci/quirks.c | 4 ++-
drivers/pnp/resource.c | 5 +--
include/asm-generic/pci.h | 43 +++++++++++++++++---------
include/linux/isa-dma.h | 14 +++++++++
sound/core/isadma.c | 2 +-
37 files changed, 64 insertions(+), 241 deletions(-)
create mode 100644 include/linux/isa-dma.h

--
2.36.1