[PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Jason Gaston]

Hello,

This patch adds the Intel ICH7R SATA RAID DID to the pci_ids.h file.  This patch was built against the 2.6.13-rc4 kernel.  
If acceptable, please apply. 

Thanks,

Jason Gaston

Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com>

--- linux-2.6.13-rc4/include/linux/pci_ids.h.orig	2005-07-29 09:06:03.841520568 -0700
+++ linux-2.6.13-rc4/include/linux/pci_ids.h	2005-07-29 09:06:42.256680576 -0700
@@ -2454,6 +2454,7 @@
 #define PCI_DEVICE_ID_INTEL_ICH7_3	0x27c1
 #define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
 #define PCI_DEVICE_ID_INTEL_ICH7_31	0x27bd
+#define PCI_DEVICE_ID_INTEL_ICH7_4	0x27c3
 #define PCI_DEVICE_ID_INTEL_ICH7_5	0x27c4
 #define PCI_DEVICE_ID_INTEL_ICH7_6	0x27c5
 #define PCI_DEVICE_ID_INTEL_ICH7_7	0x27c8

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Jeff Garzik]

Jason Gaston wrote:
> Hello,
> 
> This patch adds the Intel ICH7R SATA RAID DID to the pci_ids.h file.  This patch was built against the 2.6.13-rc4 kernel.  
> If acceptable, please apply. 
> 
> Thanks,
> 
> Jason Gaston
> 
> Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com>
> 
> --- linux-2.6.13-rc4/include/linux/pci_ids.h.orig	2005-07-29 09:06:03.841520568 -0700
> +++ linux-2.6.13-rc4/include/linux/pci_ids.h	2005-07-29 09:06:42.256680576 -0700
> @@ -2454,6 +2454,7 @@
>  #define PCI_DEVICE_ID_INTEL_ICH7_3	0x27c1
>  #define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
>  #define PCI_DEVICE_ID_INTEL_ICH7_31	0x27bd
> +#define PCI_DEVICE_ID_INTEL_ICH7_4	0x27c3
>  #define PCI_DEVICE_ID_INTEL_ICH7_5	0x27c4
>  #define PCI_DEVICE_ID_INTEL_ICH7_6	0x27c5
>  #define PCI_DEVICE_ID_INTEL_ICH7_7	0x27c8

Where is this actually used?

I purposefully do not use PCI_DEVICE_ID_xxx in my drivers, because I 
feel that linux/pci_ids.h is constantly patched for little value.

Device ids, unlike vendor ids, are largely single-use constants.

	Jeff

RE: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Gaston, Jason D]

This define is not actually used anywhere that I know of.  I just wanted
to be consistent and correct, following what was previously done.  I
have been wondering if I should be adding devices to the pci_ids.h file
that are not being currently used.  It seems like most drivers are not
using these defines and are just using the DID's directly.  In the
future, should I only be add devices that are actually using the defines
somewhere?

Thanks,

Jason



>-----Original Message-----
>From: Jeff Garzik [mailto:jgarzik@pobox.com]
>Sent: Friday, July 29, 2005 2:49 PM
>To: Gaston, Jason D
>Cc: mj@ucw.cz; akpm@osdl.org; linux-kernel@vger.kernel.org
>Subject: Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R
>
>Jason Gaston wrote:
>> Hello,
>>
>> This patch adds the Intel ICH7R SATA RAID DID to the pci_ids.h file.
>This patch was built against the 2.6.13-rc4 kernel.
>> If acceptable, please apply.
>>
>> Thanks,
>>
>> Jason Gaston
>>
>> Signed-off-by:  Jason Gaston <Jason.d.gaston@intel.com>
>>
>> --- linux-2.6.13-rc4/include/linux/pci_ids.h.orig	2005-07-29
>09:06:03.841520568 -0700
>> +++ linux-2.6.13-rc4/include/linux/pci_ids.h	2005-07-29
>09:06:42.256680576 -0700
>> @@ -2454,6 +2454,7 @@
>>  #define PCI_DEVICE_ID_INTEL_ICH7_3	0x27c1
>>  #define PCI_DEVICE_ID_INTEL_ICH7_30	0x27b0
>>  #define PCI_DEVICE_ID_INTEL_ICH7_31	0x27bd
>> +#define PCI_DEVICE_ID_INTEL_ICH7_4	0x27c3
>>  #define PCI_DEVICE_ID_INTEL_ICH7_5	0x27c4
>>  #define PCI_DEVICE_ID_INTEL_ICH7_6	0x27c5
>>  #define PCI_DEVICE_ID_INTEL_ICH7_7	0x27c8
>
>Where is this actually used?
>
>I purposefully do not use PCI_DEVICE_ID_xxx in my drivers, because I
>feel that linux/pci_ids.h is constantly patched for little value.
>
>Device ids, unlike vendor ids, are largely single-use constants.
>
>	Jeff
>
>

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Jeff Garzik]

Gaston, Jason D wrote:
> This define is not actually used anywhere that I know of.  I just wanted
> to be consistent and correct, following what was previously done.  I
> have been wondering if I should be adding devices to the pci_ids.h file
> that are not being currently used.  It seems like most drivers are not
> using these defines and are just using the DID's directly.  In the
> future, should I only be add devices that are actually using the defines
> somewhere?

There's no clear policy, but that is my general recommendation:  Just 
add IDs to pci.ids at sourceforge.net as soon as their public, and then, 
add constants to include/linux/pci_ids.h as they are required in the code.

I would -prefer- that this be kernel policy, but I can only speak for 
IDs used [or not] in my drivers.  It just seems silly to add constants 
that are never used, though.

[speaking to the audience]  I wouldn't mind if someone did a pass 
through pci_ids.h and removed all the constants that are not being used. 
  If constants are not being used, it's IMHO more appropriate to store 
that info in pci.ids.

	Jeff

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Andrew Morton]

Jeff Garzik <jgarzik@pobox.com> wrote:
>
> [speaking to the audience]  I wouldn't mind if someone did a pass 
> through pci_ids.h and removed all the constants that are not being used. 
>   If constants are not being used, it's IMHO more appropriate to store 
> that info in pci.ids.

It looks like Greg is planning on nuking pci.ids.


>From owner-linux-pci@atrey.karlin.mff.cuni.cz Sat Jul 16 21:07:30 2005
Date: Sun, 17 Jul 2005 04:22:20 +0200
From: Adrian Bunk <bunk@stusta.de>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: mj@ucw.cz
Subject: PCI: remove CONFIG_PCI_NAMES
Message-ID: <20050717022220.GC3613@stusta.de>

This patch removes CONFIG_PCI_NAMES.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 Documentation/feature-removal-schedule.txt |    9 
 MAINTAINERS                                |    7 
 arch/alpha/kernel/sys_marvel.c             |    5 
 arch/ppc64/kernel/eeh.c                    |   31 
 arch/ppc64/kernel/iSeries_VpdInfo.c        |    5 
 arch/ppc64/kernel/pci.c                    |    1 
 drivers/char/drm/drmP.h                    |    4 
 drivers/infiniband/hw/mthca/mthca_main.c   |    8 
 drivers/infiniband/hw/mthca/mthca_reset.c  |    8 
 drivers/net/irda/vlsi_ir.h                 |    6 
 drivers/pci/Kconfig                        |   17 
 drivers/pci/Makefile                       |   18 
 drivers/pci/gen-devlist.c                  |  132 
 drivers/pci/names.c                        |  137 
 drivers/pci/pci.ids                        |10180 -----------------------------
 drivers/pci/probe.c                        |    2 
 drivers/pci/proc.c                         |   12 
 drivers/usb/core/hcd-pci.c                 |    4 
 drivers/video/nvidia/nvidia.c              |    4 
 drivers/video/riva/fbdev.c                 |    4 
 include/linux/pci.h                        |   14 
 21 files changed, 32 insertions(+), 10576 deletions(-)

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Jeff Garzik]

Andrew Morton wrote:
> Jeff Garzik <jgarzik@pobox.com> wrote:
> 
>>[speaking to the audience]  I wouldn't mind if someone did a pass 
>>through pci_ids.h and removed all the constants that are not being used. 
>>  If constants are not being used, it's IMHO more appropriate to store 
>>that info in pci.ids.
> 
> 
> It looks like Greg is planning on nuking pci.ids.

 From the kernel, yes, that's been long planned.  But not from existence.

The kernel source code is an inappropriate place to store random hex 
numbers that the kernel itself does not use.

Or IOW, we shouldn't be knowingly storing dead code in linux/pci_ids.h :)

	Jeff

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Grant Coady]

On Fri, 29 Jul 2005 18:21:05 -0400, Jeff Garzik <jgarzik@pobox.com> wrote:
>
>[speaking to the audience]  I wouldn't mind if someone did a pass 
>through pci_ids.h and removed all the constants that are not being used. 

Only these seem not referenced by source:
PCI_CLASS_SYSTEM_PCI_HOTPLUG
PCI_DEVICE_ID_CYRIX_PCI_MASTER
PCI_DEVICE_ID_HP_PCI_LBA
PCI_DEVICE_ID_NP_PCI_FDDI
PCI_DEVICE_ID_UPCI_RM3_4PORT
PCI_DEVICE_ID_UPCI_RM3_8PORT

Source macros refer to:
  BROOKTREE	sound/pci/bt87x.c
  YAMAHA	sound/oss/ymfpci.c

6 from 2329 entries hardly worth it?

Grant.

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Jeff Garzik]

Grant Coady wrote:
> On Fri, 29 Jul 2005 18:21:05 -0400, Jeff Garzik <jgarzik@pobox.com> wrote:
> 
>>[speaking to the audience]  I wouldn't mind if someone did a pass 
>>through pci_ids.h and removed all the constants that are not being used. 
> 
> 
> Only these seem not referenced by source:
> PCI_CLASS_SYSTEM_PCI_HOTPLUG
> PCI_DEVICE_ID_CYRIX_PCI_MASTER
> PCI_DEVICE_ID_HP_PCI_LBA
> PCI_DEVICE_ID_NP_PCI_FDDI
> PCI_DEVICE_ID_UPCI_RM3_4PORT
> PCI_DEVICE_ID_UPCI_RM3_8PORT
> 
> Source macros refer to:
>   BROOKTREE	sound/pci/bt87x.c
>   YAMAHA	sound/oss/ymfpci.c
> 
> 6 from 2329 entries hardly worth it?

However you did your search, you did it wrong.  The very first two 
entries I tried had zero uses:

[jgarzik@pretzel linux-2.6]$ grepsrc ICH7_22
./include/linux/pci_ids.h:#define PCI_DEVICE_ID_INTEL_ICH7_22   0x27e0
[jgarzik@pretzel linux-2.6]$ grepsrc ICH7_23
./include/linux/pci_ids.h:#define PCI_DEVICE_ID_INTEL_ICH7_23   0x27e2
[jgarzik@pretzel linux-2.6]$

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Grant Coady]

On Fri, 29 Jul 2005 23:52:39 -0400, Jeff Garzik <jgarzik@pobox.com> wrote:
>
>However you did your search, you did it wrong.  The very first two 
>entries I tried had zero uses:
>
>[jgarzik@pretzel linux-2.6]$ grepsrc ICH7_22
>./include/linux/pci_ids.h:#define PCI_DEVICE_ID_INTEL_ICH7_22   0x27e0
>[jgarzik@pretzel linux-2.6]$ grepsrc ICH7_23
>./include/linux/pci_ids.h:#define PCI_DEVICE_ID_INTEL_ICH7_23   0x27e2
>[jgarzik@pretzel linux-2.6]$

Sorry Jeff, excluding "include/linux/pci_ids.h" makes a huge difference :o)

Does roughly 1/3 unused:

63065 2005-07-30 14:51 pci_ids-list
19243 2005-07-30 14:52 pci_ids-not_used

Seem in ballpark?

Thanks,
Grant.

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Grant Coady]

On Fri, 29 Jul 2005 18:21:05 -0400, Jeff Garzik <jgarzik@pobox.com> wrote:
>
>[speaking to the audience]  I wouldn't mind if someone did a pass 
>through pci_ids.h and removed all the constants that are not being used. 
>  If constants are not being used, it's IMHO more appropriate to store 
>that info in pci.ids.

For: 

linux-2.6.13-rc4:
118 pci_ids-defined_elsewhere-files
475 pci_ids-defined_elsewhere-items
7 pci_ids-duplicate-items
2321 pci_ids-list
725 pci_ids-not_used

linux-2.6.13-rc3-mm3:
119 pci_ids-defined_elsewhere-files
475 pci_ids-defined_elsewhere-items
7 pci_ids-duplicate-items
2325 pci_ids-list
723 pci_ids-not_used

Should the 'defined elsewhere' items be brought into the one 
pci_ids.h file?  Testing will take time.  Patch is ~70kB.

Grant.

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Jeff Garzik]

Grant Coady wrote:
> Does roughly 1/3 unused:
> 
> 63065 2005-07-30 14:51 pci_ids-list
> 19243 2005-07-30 14:52 pci_ids-not_used
> 
> Seem in ballpark?

Yes.

	Jeff

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Jeff Garzik]

Grant Coady wrote:
> For: 
> 
> linux-2.6.13-rc4:
> 118 pci_ids-defined_elsewhere-files
> 475 pci_ids-defined_elsewhere-items
> 7 pci_ids-duplicate-items
> 2321 pci_ids-list
> 725 pci_ids-not_used
> 
> linux-2.6.13-rc3-mm3:
> 119 pci_ids-defined_elsewhere-files
> 475 pci_ids-defined_elsewhere-items
> 7 pci_ids-duplicate-items
> 2325 pci_ids-list
> 723 pci_ids-not_used
> 
> Should the 'defined elsewhere' items be brought into the one 
> pci_ids.h file?  Testing will take time.  Patch is ~70kB.


Separate change, separate patch.

	Jeff

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Greg KH]

On Sat, Jul 30, 2005 at 02:54:17PM +1000, Grant Coady wrote:
> On Fri, 29 Jul 2005 23:52:39 -0400, Jeff Garzik <jgarzik@pobox.com> wrote:
> >
> >However you did your search, you did it wrong.  The very first two 
> >entries I tried had zero uses:
> >
> >[jgarzik@pretzel linux-2.6]$ grepsrc ICH7_22
> >./include/linux/pci_ids.h:#define PCI_DEVICE_ID_INTEL_ICH7_22   0x27e0
> >[jgarzik@pretzel linux-2.6]$ grepsrc ICH7_23
> >./include/linux/pci_ids.h:#define PCI_DEVICE_ID_INTEL_ICH7_23   0x27e2
> >[jgarzik@pretzel linux-2.6]$
> 
> Sorry Jeff, excluding "include/linux/pci_ids.h" makes a huge difference :o)
> 
> Does roughly 1/3 unused:
> 
> 63065 2005-07-30 14:51 pci_ids-list
> 19243 2005-07-30 14:52 pci_ids-not_used
> 
> Seem in ballpark?

Great, care to send me a patch that trims this file down?

thanks,

greg k-h

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Grant Coady]

On Sat, 10 Sep 2005 20:11:50 -0700, Greg KH <greg@kroah.com> wrote:

>On Sat, Jul 30, 2005 at 02:54:17PM +1000, Grant Coady wrote:
>> On Fri, 29 Jul 2005 23:52:39 -0400, Jeff Garzik <jgarzik@pobox.com> wrote:
>> >
>> >However you did your search, you did it wrong.  The very first two 
>> >entries I tried had zero uses:
>> >
>> >[jgarzik@pretzel linux-2.6]$ grepsrc ICH7_22
>> >./include/linux/pci_ids.h:#define PCI_DEVICE_ID_INTEL_ICH7_22   0x27e0
>> >[jgarzik@pretzel linux-2.6]$ grepsrc ICH7_23
>> >./include/linux/pci_ids.h:#define PCI_DEVICE_ID_INTEL_ICH7_23   0x27e2
>> >[jgarzik@pretzel linux-2.6]$
>> 
>> Sorry Jeff, excluding "include/linux/pci_ids.h" makes a huge difference :o)
>> 
>> Does roughly 1/3 unused:
>> 
>> 63065 2005-07-30 14:51 pci_ids-list
>> 19243 2005-07-30 14:52 pci_ids-not_used
>> 
>> Seem in ballpark?
>
>Great, care to send me a patch that trims this file down?

Just ran the discovery script on 2.6.13.mm2, there's roughly 1609 
symbols unused in pci_ids.h, another 1030 are defined throughout the 
source tree, leaving 729 in pci_ids.h.  Total unique symbols is 1030.
Not counted are macro defined symbols: 

PCI_DEVICE_ID_##id
PCI_DEVICE_ID_##v##_##d
PCI_DEVICE_ID_BROOKTREE_##chip
PCI_VENDOR_ID_##v

from:

linux-2.6.13-mm2/drivers/video/cirrusfb.c
linux-2.6.13-mm2/sound/oss/ymfpci.c
linux-2.6.13-mm2/sound/pci/bt87x.c


What is the goal here?  Is a comment stripped, non-duplicate pci_ids.h 
with a reference to source site okay? 
 
Should the various distributed defines be collected to the one header 
file and that header be include'd to those files?  It seems pci_ids.h 
is redundant.

Thanks,
Grant.

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Jeff Garzik]

Grant Coady wrote:
> Just ran the discovery script on 2.6.13.mm2, there's roughly 1609 
> symbols unused in pci_ids.h, another 1030 are defined throughout the 
> source tree, leaving 729 in pci_ids.h.  Total unique symbols is 1030.
> Not counted are macro defined symbols: 
> 
> PCI_DEVICE_ID_##id
> PCI_DEVICE_ID_##v##_##d
> PCI_DEVICE_ID_BROOKTREE_##chip
> PCI_VENDOR_ID_##v
> 
> from:
> 
> linux-2.6.13-mm2/drivers/video/cirrusfb.c
> linux-2.6.13-mm2/sound/oss/ymfpci.c
> linux-2.6.13-mm2/sound/pci/bt87x.c
> 
> 
> What is the goal here?  Is a comment stripped, non-duplicate pci_ids.h 
> with a reference to source site okay? 

Not sure what your last question is asking.  The current goal is to 
remove completely unused symbols from pci_ids.h, nothing more.


> Should the various distributed defines be collected to the one header 
> file and that header be include'd to those files?  It seems pci_ids.h 
> is redundant.

pci_ids.h should be the place where PCI IDs (class, vendor, device) are 
collected.

Long term, we should be able to trim a lot of device ids, since they are 
usually only used in one place.

	Jeff

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Grant Coady]

On Sun, 11 Sep 2005 04:51:10 -0400, Jeff Garzik <jgarzik@pobox.com> wrote:

>Grant Coady wrote:
>> Just ran the discovery script on 2.6.13.mm2, there's roughly 1609 
>> symbols unused in pci_ids.h, another 1030 are defined throughout the 
>> source tree, leaving 729 in pci_ids.h.  Total unique symbols is 1030.
>> Not counted are macro defined symbols: 
>> 
>> PCI_DEVICE_ID_##id
>> PCI_DEVICE_ID_##v##_##d
>> PCI_DEVICE_ID_BROOKTREE_##chip
>> PCI_VENDOR_ID_##v
>> 
>> from:
>> 
>> linux-2.6.13-mm2/drivers/video/cirrusfb.c
>> linux-2.6.13-mm2/sound/oss/ymfpci.c
>> linux-2.6.13-mm2/sound/pci/bt87x.c
>> 
>> 
>> What is the goal here?  Is a comment stripped, non-duplicate pci_ids.h 
>> with a reference to source site okay? 
>
>Not sure what your last question is asking.  The current goal is to 
>remove completely unused symbols from pci_ids.h, nothing more.

Okay, ignore this part, I was thinking something else.
>
>
>> Should the various distributed defines be collected to the one header 
>> file and that header be include'd to those files?  It seems pci_ids.h 
>> is redundant.
>
>pci_ids.h should be the place where PCI IDs (class, vendor, device) are 
>collected.

Okay.
>
>Long term, we should be able to trim a lot of device ids, since they are 
>usually only used in one place.

Okay, dunno when, need to fix script and test some more, it's eating 
live symbols :(  Long time since I looked at this area.

Grant.

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Grant]

On Sun, 11 Sep 2005 04:51:10 -0400, Jeff Garzik <jgarzik@pobox.com> wrote:
>
>pci_ids.h should be the place where PCI IDs (class, vendor, device) are 
>collected.

Few files reference it.
>
>Long term, we should be able to trim a lot of device ids, since they are 
>usually only used in one place.

Well, they're not, and trimming a file marked for removal is pointless.

Grant.

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Greg KH]

On Tue, Sep 13, 2005 at 04:46:45PM +1000, Grant wrote:
> On Sun, 11 Sep 2005 04:51:10 -0400, Jeff Garzik <jgarzik@pobox.com> wrote:
> >
> >pci_ids.h should be the place where PCI IDs (class, vendor, device) are 
> >collected.
> 
> Few files reference it.

include/pci.h does, so pretty much every pci driver does because of
that.

> >Long term, we should be able to trim a lot of device ids, since they are 
> >usually only used in one place.
> 
> Well, they're not, and trimming a file marked for removal is pointless.

Huh?  That file isn't marked for removal, that was the id database,
which is now gone...

thanks,

greg k-h

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Grant Coady]

On Tue, 13 Sep 2005 00:03:24 -0700, Greg KH <gregkh@suse.de> wrote:

>On Tue, Sep 13, 2005 at 04:46:45PM +1000, Grant wrote:
>> On Sun, 11 Sep 2005 04:51:10 -0400, Jeff Garzik <jgarzik@pobox.com> wrote:
>> >
>> >pci_ids.h should be the place where PCI IDs (class, vendor, device) are 
>> >collected.
>> 
>> Few files reference it.
>
>include/pci.h does, so pretty much every pci driver does because of
>that.

That's probably the little aspect I missed :)  Something wasn't making 
sense to me.
>
>> >Long term, we should be able to trim a lot of device ids, since they are 
>> >usually only used in one place.
>> 
>> Well, they're not, and trimming a file marked for removal is pointless.
>
>Huh?  That file isn't marked for removal, that was the id database,
>which is now gone...

Ahh, that explains my confusion, I'll have another look at it.

Grant.

Re: [PATCH 2.6.13-rc4 1/1] pci_ids: patch for Intel ICH7R

[Grant Coady]

Jeff Garzik wrote:
> 
> pci_ids.h should be the place where PCI IDs (class, vendor, device) are 
> collected.
> 
> Long term, we should be able to trim a lot of device ids, since they are 
> usually only used in one place.
> 
These two sentences seem mutually exclusive to me, you want pci_ids collected
in the header file, _and_ then trim single use IDs from which: the header,
or the source.c file defining them?  Present usage is ~50/50, which way to
go?

Grant.