Re: [PATCH net-next v2 5/6] ethernet: amd: fix pci device ids
From: Sergei Shtylyov
Date: Mon Jul 14 2014 - 13:36:27 EST
Hello.
On 07/14/2014 10:25 AM, varkabhadram@xxxxxxxxx wrote:
From: Varka Bhadram <varkab@xxxxxxx>
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 <varkab@xxxxxxx>
---
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
--
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/