From: Benoit Taine <benoit.taine@lip6.fr>
To: Stanislaw Gruszka <sgruszka@redhat.com>
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 3/25] iwlegacy: Replace DEFINE_PCI_DEVICE_TABLE macro use
Date: Fri, 18 Jul 2014 17:26:50 +0200 [thread overview]
Message-ID: <1405697232-11785-4-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>
---
Not tested.
drivers/net/wireless/iwlegacy/3945.c | 2 +-
drivers/net/wireless/iwlegacy/4965-mac.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/iwlegacy/3945.c b/drivers/net/wireless/iwlegacy/3945.c
index b598e28..93bdf68 100644
--- a/drivers/net/wireless/iwlegacy/3945.c
+++ b/drivers/net/wireless/iwlegacy/3945.c
@@ -2728,7 +2728,7 @@ static struct il_cfg il3945_abg_cfg = {
},
};
-DEFINE_PCI_DEVICE_TABLE(il3945_hw_card_ids) = {
+const struct pci_device_id il3945_hw_card_ids[] = {
{IL_PCI_DEVICE(0x4222, 0x1005, il3945_bg_cfg)},
{IL_PCI_DEVICE(0x4222, 0x1034, il3945_bg_cfg)},
{IL_PCI_DEVICE(0x4222, 0x1044, il3945_bg_cfg)},
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index c159c05..3dcbe2c 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -6800,7 +6800,7 @@ il4965_txq_set_sched(struct il_priv *il, u32 mask)
*****************************************************************************/
/* Hardware specific file defines the PCI IDs table for that hardware module */
-static DEFINE_PCI_DEVICE_TABLE(il4965_hw_card_ids) = {
+static const struct pci_device_id il4965_hw_card_ids[] = {
{IL_PCI_DEVICE(0x4229, PCI_ANY_ID, il4965_cfg)},
{IL_PCI_DEVICE(0x4230, PCI_ANY_ID, il4965_cfg)},
{0}
next prev parent reply other threads:[~2014-07-18 15:26 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 ` Benoit Taine [this message]
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 ` [PATCH 21/25] hostap: " Benoit Taine
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-4-git-send-email-benoit.taine@lip6.fr \
--to=benoit.taine@lip6.fr \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=sgruszka@redhat.com \
/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).