[PATCH v2 1/2] asm-generic: Remove pci.h copying remaining code to x86

Stafford Horne shorne at gmail.com
Sun Jul 17 19:42:32 AEST 2022


On Sun, Jul 17, 2022, 6:23 PM Geert Uytterhoeven <geert at linux-m68k.org>
wrote:

> Hi Stafford,
>
> On Sun, Jul 17, 2022 at 5:35 AM Stafford Horne <shorne at 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 <arnd at arndb.de>
> > Link:
> https://lore.kernel.org/lkml/CAK8P3a0JmPeczfmMBE__vn=Jbvf=nkbpVaZCycyv40pZNCJJXQ@mail.gmail.com/
> > Signed-off-by: Stafford Horne <shorne at 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

>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20220717/5bcf5123/attachment-0001.htm>


More information about the Linuxppc-dev mailing list