From: Benoit Taine <benoit.taine@lip6.fr>
To: Samuel Ortiz <samuel@sortiz.org>
Cc: benoit.taine@lip6.fr, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 19/25] irda: Replace DEFINE_PCI_DEVICE_TABLE macro use
Date: Fri, 18 Jul 2014 17:27:06 +0200 [thread overview]
Message-ID: <1405697232-11785-20-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/irda/donauboe.c | 2 +-
drivers/net/irda/via-ircc.c | 2 +-
drivers/net/irda/vlsi_ir.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 6d3e209..a87a82c 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -184,7 +184,7 @@
#define CONFIG0H_DMA_ON_NORX CONFIG0H_DMA_OFF| OBOE_CONFIG0H_ENDMAC
#define CONFIG0H_DMA_ON CONFIG0H_DMA_ON_NORX | OBOE_CONFIG0H_ENRX
-static DEFINE_PCI_DEVICE_TABLE(toshoboe_pci_tbl) = {
+static const struct pci_device_id toshoboe_pci_tbl[] = {
{ PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIR701, PCI_ANY_ID, PCI_ANY_ID, },
{ PCI_VENDOR_ID_TOSHIBA, PCI_DEVICE_ID_FIRD01, PCI_ANY_ID, PCI_ANY_ID, },
{ } /* Terminating entry */
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 998bb89..36e0042 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -115,7 +115,7 @@ static void iodelay(int udelay)
}
}
-static DEFINE_PCI_DEVICE_TABLE(via_pci_tbl) = {
+static const struct pci_device_id via_pci_tbl[] = {
{ PCI_VENDOR_ID_VIA, 0x8231, PCI_ANY_ID, PCI_ANY_ID,0,0,0 },
{ PCI_VENDOR_ID_VIA, 0x3109, PCI_ANY_ID, PCI_ANY_ID,0,0,1 },
{ PCI_VENDOR_ID_VIA, 0x3074, PCI_ANY_ID, PCI_ANY_ID,0,0,2 },
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 58ef594..a04af9d 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -58,7 +58,7 @@ MODULE_LICENSE("GPL");
static /* const */ char drivername[] = DRIVER_NAME;
-static DEFINE_PCI_DEVICE_TABLE(vlsi_irda_table) = {
+static const struct pci_device_id vlsi_irda_table[] = {
{
.class = PCI_CLASS_WIRELESS_IRDA << 8,
.class_mask = PCI_CLASS_SUBCLASS_MASK << 8,
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 ` Benoit Taine [this message]
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-20-git-send-email-benoit.taine@lip6.fr \
--to=benoit.taine@lip6.fr \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=samuel@sortiz.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).