Subject: Re: [PATCH net-next v2 5/6] ethernet: amd: fix pci device ids

From: Sergei Shtylyov <[email-masked]>
Date: Mon, 14 Jul 2014 21:36:17 +0400

Hello.

On 07/14/2014 10:25 AM, [email-masked] wrote:

> From: Varka Bhadram <[email-masked]>

> Normally any device ids will be above the corresponding device driver
> structure. This patch moves the pci device ids and MODULE_DEVICE_TABLE()
> above the pci driver structure.

> Signed-off-by: Varka Bhadram <[email-masked]>
> ---
>   drivers/net/ethernet/amd/amd8111e.c |   20 +++++++++++---------
>   1 file changed, 11 insertions(+), 9 deletions(-)

> diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
> index e2fb9e2..3e41568 100644
> --- a/drivers/net/ethernet/amd/amd8111e.c
> +++ b/drivers/net/ethernet/amd/amd8111e.c
[...]
> @@ -109,14 +108,6 @@ MODULE_PARM_DESC(coalesce, "Enable or Disable interrupt coalescing, 1: Enable, 0
>   module_param_array(dynamic_ipg, bool, NULL, 0);
>   MODULE_PARM_DESC(dynamic_ipg, "Enable or Disable dynamic IPG, 1: Enable, 0: Disable");
>
> -static DEFINE_PCI_DEVICE_TABLE(amd8111e_pci_tbl) = {
> -
> -	{ PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD8111E_7462,
> -	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
> -	{ 0, }
> -
> -};
> -
>   /* This function will read the PHY registers. */
>   static int amd8111e_read_phy(struct amd8111e_priv* lp, int phy_id, int reg, u32* val)
>   {
> @@ -1953,6 +1944,17 @@ static void amd8111e_remove_one(struct pci_dev *pdev)
>   	}
>   }
>
> +static const struct pci_device_id amd8111e_pci_tbl[] = {
> +	{
> +	 .vendor = PCI_VENDOR_ID_AMD,
> +	 .device = PCI_DEVICE_ID_AMD8111E_7462,

    I don't that's equivalent to what was there before: PCI_ANY_ID is defined 
as (~0), not 0.

> +	},
> +	{
> +	 .vendor = 0,

    You can completely skip the explicit initializers, the entry will be 
init'ed with 0s anyway.

> +	}
> +};
> +MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl);
> +

WBR, Sergei