Re: [PATCH 2/3] tty: rocket: Explicitly list supported PCI IDs

[Greg KH <gregkh@linuxfoundation.org>]

On Sat, Dec 29, 2012 at 11:23:23PM -0800, Kevin Cernekee wrote:
> Matching PCI_ANY_ID causes conflicts with RocketPort 2 adapters, which
> are supported by a different driver.
> 
> Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
> ---
>  drivers/tty/rocket.c |   31 ++++++++++++++++++++++++++++---
>  1 file changed, 28 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
> index e42009a..c73ca4e 100644
> --- a/drivers/tty/rocket.c
> +++ b/drivers/tty/rocket.c
> @@ -1758,8 +1758,32 @@ static void rp_flush_buffer(struct tty_struct *tty)
>  
>  #ifdef CONFIG_PCI
>  
> -static struct pci_device_id __used rocket_pci_ids[] = {
> -	{ PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_ANY_ID) },
> +#define RP_PCI_DEVICE(id) \
> +	{ PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_DEVICE_ID_##id) }
> +
> +static DEFINE_PCI_DEVICE_TABLE(rocket_pci_ids) = {
> +	RP_PCI_DEVICE(RP4QUAD),

Ick, no, please just use the PCI_DEVICE() macro and don't define a new
one that makes it hard to grep for things.  It's not that hard to just
list them all properly.

thanks,

greg k-h