Re: [PATCH 10/19] drivers/net/wan: Use PCI_VDEVICE

[Krzysztof Halasa]

Joe Perches <joe@xxxxxxxxxxx> writes:

> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
> ---
>  drivers/net/wan/farsync.c   |   21 +++++++--------------
>  drivers/net/wan/pc300_drv.c |   12 ++++++------
>  drivers/net/wan/pc300too.c  |   12 ++++--------
>  drivers/net/wan/wanxl.c     |    9 +++------
>  4 files changed, 20 insertions(+), 34 deletions(-)

Looks good.

Though I guess I'd delete these now unnecessary empty lines if I were
you:

> +++ b/drivers/net/wan/farsync.c
> @@ -528,26 +528,19 @@ static int fst_debug_mask = { FST_DEBUG };
>   *      PCI ID lookup table
>   */
>  static struct pci_device_id fst_pci_dev_id[] __devinitdata = {
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2P, PCI_ANY_ID, 
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_T2P},
> +	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T2P), FST_TYPE_T2P},
>  
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T4P, PCI_ANY_ID, 
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_T4P},
> +	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T4P), FST_TYPE_T4P},
>  
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T1U, PCI_ANY_ID, 
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_T1U},
> +	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T1U), FST_TYPE_T1U},
>  
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2U, PCI_ANY_ID, 
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_T2U},
> +	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T2U), FST_TYPE_T2U},
>  
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T4U, PCI_ANY_ID, 
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_T4U},
> +	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T4U), FST_TYPE_T4U},
>  
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_TE1, PCI_ANY_ID, 
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_TE1},
> +	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_TE1), FST_TYPE_TE1},
>  
> -	{PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_TE1C, PCI_ANY_ID, 
> -	 PCI_ANY_ID, 0, 0, FST_TYPE_TE1},
> +	{PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_TE1C), FST_TYPE_TE1},
>  	{0,}			/* End */
>  };

The rest of WAN bits - ack.
-- 
Krzysztof Halasa
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/