On Sun, Jul 17, 2022, 6:23 PM Geert Uytterhoeven <ge...@linux-m68k.org> wrote:
> Hi Stafford, > > On Sun, Jul 17, 2022 at 5:35 AM Stafford Horne <sho...@gmail.com> wrote: > > The generic pci.h header now only provides a definition of > > pci_get_legacy_ide_irq which is used by architectures that support PNP. > > Of the architectures that use asm-generic/pci.h this is only x86. > > > > 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 x86. On other architectures > > we clean up any outstanding references. > > > > Suggested-by: Arnd Bergmann <a...@arndb.de> > > Link: > https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpvazcycyv40pzncj...@mail.gmail.com/ > > Signed-off-by: Stafford Horne <sho...@gmail.com> > > Thanks for your patch! > > > --- a/arch/m68k/include/asm/pci.h > > +++ b/arch/m68k/include/asm/pci.h > > @@ -2,11 +2,14 @@ > > #ifndef _ASM_M68K_PCI_H > > #define _ASM_M68K_PCI_H > > > > -#include <asm-generic/pci.h> > > - > > #define pcibios_assign_all_busses() 1 > > > > #define PCIBIOS_MIN_IO 0x00000100 > > #define PCIBIOS_MIN_MEM 0x02000000 > > > > +static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int > channel) > > +{ > > + return channel ? 15 : 14; > > +} > > + > > I thought you were not going to add this? > I though so too. Somehow I lost track of a fixup. I'll send a v3 tomorrow. -Stafford >
