From: Benoit Taine <benoit.taine@lip6.fr>
To: Jouni Malinen <j@w1.fi>
Cc: benoit.taine@lip6.fr, "John W. Linville" <linville@tuxdriver.com>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 21/25] hostap: Replace DEFINE_PCI_DEVICE_TABLE macro use
Date: Fri, 18 Jul 2014 17:27:08 +0200 [thread overview]
Message-ID: <1405697232-11785-22-git-send-email-benoit.taine@lip6.fr> (raw)
In-Reply-To: <1405697232-11785-1-git-send-email-benoit.taine@lip6.fr>
We should prefer `struct pci_device_id` over `DEFINE_PCI_DEVICE_TABLE` to meet
kernel coding style guidelines. This issue was reported by checkpatch.
Signed-off-by: Benoit Taine <benoit.taine@lip6.fr>
---
Tested by compilation without errors.
drivers/net/wireless/hostap/hostap_pci.c | 2 +-
drivers/net/wireless/hostap/hostap_plx.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 91158e2..c864ef4 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -39,7 +39,7 @@ struct hostap_pci_priv {
/* FIX: do we need mb/wmb/rmb with memory operations? */
-static DEFINE_PCI_DEVICE_TABLE(prism2_pci_id_table) = {
+static const struct pci_device_id prism2_pci_id_table[] = {
/* Intersil Prism3 ISL3872 11Mb/s WLAN Controller */
{ 0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID },
/* Intersil Prism2.5 ISL3874 11Mb/s WLAN Controller */
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c
index 3bf530d..4901a99 100644
--- a/drivers/net/wireless/hostap/hostap_plx.c
+++ b/drivers/net/wireless/hostap/hostap_plx.c
@@ -60,7 +60,7 @@ struct hostap_plx_priv {
#define PLXDEV(vendor,dev,str) { vendor, dev, PCI_ANY_ID, PCI_ANY_ID }
-static DEFINE_PCI_DEVICE_TABLE(prism2_plx_id_table) = {
+static const struct pci_device_id prism2_plx_id_table[] = {
PLXDEV(0x10b7, 0x7770, "3Com AirConnect PCI 777A"),
PLXDEV(0x111a, 0x1023, "Siemens SpeedStream SS1023"),
PLXDEV(0x126c, 0x8030, "Nortel emobility"),
next prev parent reply other threads:[~2014-07-18 15:27 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
2014-07-18 15:26 ` [PATCH 1/25] bna: " Benoit Taine
2014-07-18 15:26 ` [PATCH 3/25] iwlegacy: " Benoit Taine
2014-07-18 15:26 ` [PATCH 4/25] net: pasemi: " Benoit Taine
2014-07-18 15:26 ` [PATCH 5/25] net/ethernet/sgi/ioc3-eth: " Benoit Taine
2014-07-18 15:26 ` [PATCH 7/25] rt2x00: " Benoit Taine
2014-07-18 15:26 ` [PATCH 8/25] dscc4: " Benoit Taine
2014-07-18 15:26 ` [PATCH 9/25] net: neterion: " Benoit Taine
2014-07-18 15:26 ` [PATCH 10/25] netxen: " Benoit Taine
2014-07-18 15:26 ` [PATCH 11/25] pcnet32: " Benoit Taine
2014-07-18 15:26 ` [PATCH 12/25] r8169: " Benoit Taine
2014-07-18 15:27 ` [PATCH 14/25] adm8211: " Benoit Taine
2014-07-18 15:27 ` [PATCH 15/25] qlcnic: " Benoit Taine
2014-07-18 15:27 ` [PATCH 16/25] be2net: " Benoit Taine
2014-07-18 15:27 ` [PATCH 18/25] smsc9420: " Benoit Taine
2014-07-18 15:27 ` [PATCH 19/25] irda: " Benoit Taine
2014-07-18 15:27 ` [PATCH 20/25] via-rhine: " Benoit Taine
2014-07-18 15:27 ` Benoit Taine [this message]
2014-07-18 15:27 ` [PATCH 22/25] drivers/net: " Benoit Taine
2014-07-18 15:27 ` [PATCH 24/25] starfire: " Benoit Taine
2014-07-18 16:22 ` [PATCH 0/25] " John W. Linville
2014-07-18 16:43 ` Greg KH
2014-07-18 16:54 ` James Bottomley
2014-07-18 18:17 ` Greg KH
2014-07-18 18:50 ` James Bottomley
2014-07-21 23:16 ` Bjorn Helgaas
2014-07-22 17:12 ` Benoit Taine
2014-07-18 21:14 ` Dave Airlie
2014-07-18 21:27 ` Greg KH
2014-07-18 18:05 ` Joe Perches
2014-07-18 16:28 ` James Bottomley
2014-07-18 16:33 ` Keller, Jacob E
2014-07-21 4:18 ` David Miller
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=1405697232-11785-22-git-send-email-benoit.taine@lip6.fr \
--to=benoit.taine@lip6.fr \
--cc=j@w1.fi \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).