From: Greg KH Date: Thu, 15 Jul 2010 20:45:40 +0000 Subject: Re: [PATCH 12/25] char: Convert pci_table entries to PCI_VDEVICE Message-Id: <20100715204540.GB24463@suse.de> List-Id: References: <201007152052.38060.PeterHuewe@gmx.de> In-Reply-To: <201007152052.38060.PeterHuewe@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Peter Huewe Cc: Kernel Janitors , "Digi International, Inc" , Alexey Dobriyan , Tejun Heo , Jiri Kosina , Joe Perches , linux-kernel@vger.kernel.org On Thu, Jul 15, 2010 at 08:52:37PM +0200, Peter Huewe wrote: > From: Peter Huewe > > This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and > .subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the > PCI_VDEVICE macro, and thus improves readability. > > Signed-off-by: Peter Huewe > --- > drivers/char/epca.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/char/epca.c b/drivers/char/epca.c > index d9df46a..5dafcdb 100644 > --- a/drivers/char/epca.c > +++ b/drivers/char/epca.c > @@ -2762,10 +2762,10 @@ err_out: > > > static struct pci_device_id epca_pci_tbl[] = { > - { PCI_VENDOR_DIGI, PCI_DEVICE_XR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xr }, > - { PCI_VENDOR_DIGI, PCI_DEVICE_XEM, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xem }, > - { PCI_VENDOR_DIGI, PCI_DEVICE_CX, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_cx }, > - { PCI_VENDOR_DIGI, PCI_DEVICE_XRJ, PCI_ANY_ID, PCI_ANY_ID, 0, 0, brd_xrj }, > + { PCI_VDEVICE(DIGI, PCI_DEVICE_XR), brd_xr }, > + { PCI_VDEVICE(DIGI, PCI_DEVICE_XEM), brd_xem }, > + { PCI_VDEVICE(DIGI, PCI_DEVICE_CX), brd_cx }, > + { PCI_VDEVICE(DIGI, PCI_DEVICE_XRJ), brd_xrj }, The main reason I hate this macro, is that it now makes it almost impossible to grep for any users of the PCI_VENDOR_DIGI pci vendor id. I much prefer the PCI_DEVICE() macro instead, and as such, I'm not willing to take any of these patches, sorry. greg k-h