Re: [PATCH] PCI Update for 2.6.3-rc1

[Adam Belay <ambx1@neo.rr.com>]

On Tue, Feb 10, 2004 at 08:46:12AM -0800, Greg KH wrote:
> On Tue, Feb 10, 2004 at 05:03:17PM +0100, Geert Uytterhoeven wrote:
> > On Mon, 9 Feb 2004, Greg KH wrote:
> > > ChangeSet 1.1500.11.2, 2004/01/30 16:34:48-08:00, ambx1@neo.rr.com
> > >
> > > [PATCH] PCI: Remove uneeded resource structures from pci_dev
> > >
> > > The following patch remove irq_resource and dma_resource from pci_dev.  It
> > > appears that the serial pci driver depends on irq_resource, however, it may be
> > > broken portions of an old quirk.  I attempted to maintain the existing behavior
> > > while removing irq_resource.  I changed FL_IRQRESOURCE to FL_NOIRQ.  Russell,
> > > could you provide any comments?  irq_resource and dma_resource are most likely
> > > remnants from when pci_dev was shared with pnp.
> >
> > FYI, at least one ISDN driver seems to need it as well:
> >
> > | drivers/isdn/hardware/avm/b1isa.c: In function `b1isa_init':
> > | drivers/isdn/hardware/avm/b1isa.c:183: structure has no member named `irq_resource'
>
> Ick, I don't really think we want users trying to override the irq
> number of their pci cards...

Yeah, I have plans for a struct isa_dev in 2.7.  It seems we currently
have a few cases of drivers sharing pci_dev.

>
> Here's the patch that fixes this, and one other isdn driver up.  ISDN
> people, feel free to add this to your huge patch :)
>
> thanks,
>
> greg k-h
>


It occured to me that we also have the following related code in pci.h:

--- a/include/linux/pci.h       2004-01-09 06:59:33.000000000 +0000
+++ b/include/linux/pci.h       2004-02-10 17:51:08.000000000 +0000
@@ -362,8 +362,6 @@
 #define PCI_DMA_NONE           3

 #define DEVICE_COUNT_COMPATIBLE        4
-#define DEVICE_COUNT_IRQ       2
-#define DEVICE_COUNT_DMA       2
 #define DEVICE_COUNT_RESOURCE  12

 /*

Perhaps this should be removed as well?

A quick compile and cscope didn't reveal any dependencies but it's
difficult to be positive.

Thanks,
Adam