From: varkabhadram@gmail.com
To: netdev@vger.kernel.org
Cc: Thomas.Lendacky@amd.com, geert+renesas@linux-m68k.org,
ebiederm@xmission.com, macro@linux-mips.org,
linux-kernel@vger.kernel.org, davem@davemloft.net,
Varka Bhadram <varkab@cdac.in>
Subject: [PATCH net-next 5/8] ethernet: amd: move pci device ids
Date: Fri, 11 Jul 2014 13:05:07 +0530 [thread overview]
Message-ID: <1405064110-22579-6-git-send-email-varkabhadram@gmail.com> (raw)
In-Reply-To: <1405064110-22579-1-git-send-email-varkabhadram@gmail.com>
From: Varka Bhadram <varkab@cdac.in>
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@cdac.in>
---
drivers/net/ethernet/amd/amd8111e.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index e2fb9e2..c47019d 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -101,7 +101,6 @@ Revision History:
MODULE_AUTHOR("Advanced Micro Devices, Inc.");
MODULE_DESCRIPTION ("AMD8111 based 10/100 Ethernet Controller. Driver Version "MODULE_VERS);
MODULE_LICENSE("GPL");
-MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl);
module_param_array(speed_duplex, int, NULL, 0);
MODULE_PARM_DESC(speed_duplex, "Set device speed and duplex modes, 0: Auto Negotiate, 1: 10Mbps Half Duplex, 2: 10Mbps Full Duplex, 3: 100Mbps Half Duplex, 4: 100Mbps Full Duplex");
module_param_array(coalesce, bool, NULL, 0);
@@ -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,13 @@ static void amd8111e_remove_one(struct pci_dev *pdev)
}
}
+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, }
+};
+MODULE_DEVICE_TABLE(pci, amd8111e_pci_tbl);
+
static struct pci_driver amd8111e_driver = {
.name = MODULE_NAME,
.id_table = amd8111e_pci_tbl,
--
1.7.9.5
next prev parent reply other threads:[~2014-07-11 7:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-11 7:35 [PATCH net-next 0/8] cleanup for AMD811E ethernet driver varkabhadram
2014-07-11 7:35 ` [PATCH net-next 1/8] ethernet: amd: move amd111e_remove_one after probe varkabhadram
2014-07-11 7:35 ` [PATCH net-next 2/8] ethernet: amd: use devm_ioremap() varkabhadram
2014-07-11 7:35 ` [PATCH net-next 3/8] ethernet: amd: dynamic debug fixes varkabhadram
2014-07-11 7:35 ` [PATCH net-next 4/8] ethernet: amd: fix comment styles varkabhadram
2014-07-11 7:35 ` varkabhadram [this message]
2014-07-11 7:35 ` [PATCH net-next 6/8] ethernet: amd: fix 'foo* bar' varkabhadram
2014-07-11 7:35 ` [PATCH net-next 7/8] ethernet: amd: fix spaces and few coding styles varkabhadram
2014-07-11 7:35 ` [PATCH net-next 8/8] ethernet: amd: switch case fixes varkabhadram
2014-07-11 7:47 ` Geert Uytterhoeven
2014-07-11 9:48 ` [PATCH net-next 0/8] cleanup for AMD811E ethernet driver Varka Bhadram
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405064110-22579-6-git-send-email-varkabhadram@gmail.com \
--to=varkabhadram@gmail.com \
--cc=Thomas.Lendacky@amd.com \
--cc=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=geert+renesas@linux-m68k.org \
--cc=linux-kernel@vger.kernel.org \
--cc=macro@linux-mips.org \
--cc=netdev@vger.kernel.org \
--cc=varkab@cdac.in \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox