* [PATCH 1/25] bna: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
@ 2014-07-18 15:26 ` Benoit Taine
2014-07-18 15:26 ` [PATCH 3/25] iwlegacy: " Benoit Taine
` (20 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:26 UTC (permalink / raw)
To: Rasesh Mody; +Cc: benoit.taine, netdev, linux-kernel
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/ethernet/brocade/bna/bnad.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c
index 3a77f9e..16755eb 100644
--- a/drivers/net/ethernet/brocade/bna/bnad.c
+++ b/drivers/net/ethernet/brocade/bna/bnad.c
@@ -3836,7 +3836,7 @@ bnad_pci_remove(struct pci_dev *pdev)
free_netdev(netdev);
}
-static DEFINE_PCI_DEVICE_TABLE(bnad_pci_id_table) = {
+static const struct pci_device_id bnad_pci_id_table[] = {
{
PCI_DEVICE(PCI_VENDOR_ID_BROCADE,
PCI_DEVICE_ID_BROCADE_CT),
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 3/25] iwlegacy: Replace DEFINE_PCI_DEVICE_TABLE macro use
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
2014-07-18 15:26 ` [PATCH 4/25] net: pasemi: " Benoit Taine
` (19 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:26 UTC (permalink / raw)
To: Stanislaw Gruszka
Cc: benoit.taine, John W. Linville, linux-wireless, netdev,
linux-kernel
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}
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 4/25] net: pasemi: Replace DEFINE_PCI_DEVICE_TABLE macro use
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 ` Benoit Taine
2014-07-18 15:26 ` [PATCH 5/25] net/ethernet/sgi/ioc3-eth: " Benoit Taine
` (18 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:26 UTC (permalink / raw)
To: Olof Johansson; +Cc: benoit.taine, netdev, linux-kernel
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/ethernet/pasemi/pasemi_mac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
index 9abf70d7..30d934d 100644
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
@@ -1871,7 +1871,7 @@ static void pasemi_mac_remove(struct pci_dev *pdev)
free_netdev(netdev);
}
-static DEFINE_PCI_DEVICE_TABLE(pasemi_mac_pci_tbl) = {
+static const struct pci_device_id pasemi_mac_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa005) },
{ PCI_DEVICE(PCI_VENDOR_ID_PASEMI, 0xa006) },
{ },
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 5/25] net/ethernet/sgi/ioc3-eth: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (2 preceding siblings ...)
2014-07-18 15:26 ` [PATCH 4/25] net: pasemi: " Benoit Taine
@ 2014-07-18 15:26 ` Benoit Taine
2014-07-18 15:26 ` [PATCH 7/25] rt2x00: " Benoit Taine
` (17 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:26 UTC (permalink / raw)
To: Ralf Baechle; +Cc: benoit.taine, linux-mips, netdev, linux-kernel
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/ethernet/sgi/ioc3-eth.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index 7984ad0..7a254da 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -1384,7 +1384,7 @@ static void ioc3_remove_one(struct pci_dev *pdev)
*/
}
-static DEFINE_PCI_DEVICE_TABLE(ioc3_pci_tbl) = {
+static const struct pci_device_id ioc3_pci_tbl[] = {
{ PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3, PCI_ANY_ID, PCI_ANY_ID },
{ 0 }
};
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 7/25] rt2x00: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (3 preceding siblings ...)
2014-07-18 15:26 ` [PATCH 5/25] net/ethernet/sgi/ioc3-eth: " Benoit Taine
@ 2014-07-18 15:26 ` Benoit Taine
2014-07-18 15:26 ` [PATCH 8/25] dscc4: " Benoit Taine
` (16 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:26 UTC (permalink / raw)
To: Ivo van Doorn
Cc: benoit.taine, Helmut Schaa, John W. Linville, linux-wireless,
users, netdev, linux-kernel
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/rt2x00/rt2400pci.c | 2 +-
drivers/net/wireless/rt2x00/rt2500pci.c | 2 +-
drivers/net/wireless/rt2x00/rt2800pci.c | 2 +-
drivers/net/wireless/rt2x00/rt61pci.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 4ccfef5..bdf5590 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1821,7 +1821,7 @@ static const struct rt2x00_ops rt2400pci_ops = {
/*
* RT2400pci module information.
*/
-static DEFINE_PCI_DEVICE_TABLE(rt2400pci_device_table) = {
+static const struct pci_device_id rt2400pci_device_table[] = {
{ PCI_DEVICE(0x1814, 0x0101) },
{ 0, }
};
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index a511ccc..79f4fe6 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -2120,7 +2120,7 @@ static const struct rt2x00_ops rt2500pci_ops = {
/*
* RT2500pci module information.
*/
-static DEFINE_PCI_DEVICE_TABLE(rt2500pci_device_table) = {
+static const struct pci_device_id rt2500pci_device_table[] = {
{ PCI_DEVICE(0x1814, 0x0201) },
{ 0, }
};
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index a5b32ca..cc1b3cc 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -400,7 +400,7 @@ static const struct rt2x00_ops rt2800pci_ops = {
/*
* RT2800pci module information.
*/
-static DEFINE_PCI_DEVICE_TABLE(rt2800pci_device_table) = {
+static const struct pci_device_id rt2800pci_device_table[] = {
{ PCI_DEVICE(0x1814, 0x0601) },
{ PCI_DEVICE(0x1814, 0x0681) },
{ PCI_DEVICE(0x1814, 0x0701) },
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 9048a9c..8194550 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -3075,7 +3075,7 @@ static const struct rt2x00_ops rt61pci_ops = {
/*
* RT61pci module information.
*/
-static DEFINE_PCI_DEVICE_TABLE(rt61pci_device_table) = {
+static const struct pci_device_id rt61pci_device_table[] = {
/* RT2561s */
{ PCI_DEVICE(0x1814, 0x0301) },
/* RT2561 v2 */
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 8/25] dscc4: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (4 preceding siblings ...)
2014-07-18 15:26 ` [PATCH 7/25] rt2x00: " Benoit Taine
@ 2014-07-18 15:26 ` Benoit Taine
2014-07-18 15:26 ` [PATCH 9/25] net: neterion: " Benoit Taine
` (15 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:26 UTC (permalink / raw)
To: Francois Romieu; +Cc: benoit.taine, netdev, linux-kernel
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/wan/dscc4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 288610d..0822356 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -2039,7 +2039,7 @@ static int __init dscc4_setup(char *str)
__setup("dscc4.setup=", dscc4_setup);
#endif
-static DEFINE_PCI_DEVICE_TABLE(dscc4_pci_tbl) = {
+static const struct pci_device_id dscc4_pci_tbl[] = {
{ PCI_VENDOR_ID_SIEMENS, PCI_DEVICE_ID_SIEMENS_DSCC4,
PCI_ANY_ID, PCI_ANY_ID, },
{ 0,}
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 9/25] net: neterion: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (5 preceding siblings ...)
2014-07-18 15:26 ` [PATCH 8/25] dscc4: " Benoit Taine
@ 2014-07-18 15:26 ` Benoit Taine
2014-07-18 15:26 ` [PATCH 10/25] netxen: " Benoit Taine
` (14 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:26 UTC (permalink / raw)
To: Jon Mason; +Cc: benoit.taine, netdev, linux-kernel
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/ethernet/neterion/s2io.c | 2 +-
drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index be58764..f5e4b82 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -471,7 +471,7 @@ module_param_array(rts_frm_len, uint, NULL, 0);
* S2IO device table.
* This table lists all the devices that this driver supports.
*/
-static DEFINE_PCI_DEVICE_TABLE(s2io_tbl) = {
+static const struct pci_device_id s2io_tbl[] = {
{PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_S2IO_WIN,
PCI_ANY_ID, PCI_ANY_ID},
{PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_S2IO_UNI,
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index 7a0dead..061dcf2 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -63,7 +63,7 @@ MODULE_LICENSE("Dual BSD/GPL");
MODULE_DESCRIPTION("Neterion's X3100 Series 10GbE PCIe I/O"
"Virtualized Server Adapter");
-static DEFINE_PCI_DEVICE_TABLE(vxge_id_table) = {
+static const struct pci_device_id vxge_id_table[] = {
{PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_TITAN_WIN, PCI_ANY_ID,
PCI_ANY_ID},
{PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_TITAN_UNI, PCI_ANY_ID,
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 10/25] netxen: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (6 preceding siblings ...)
2014-07-18 15:26 ` [PATCH 9/25] net: neterion: " Benoit Taine
@ 2014-07-18 15:26 ` Benoit Taine
2014-07-18 15:26 ` [PATCH 11/25] pcnet32: " Benoit Taine
` (13 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:26 UTC (permalink / raw)
To: Manish Chopra
Cc: benoit.taine, Sony Chacko, Rajesh Borundia, netdev, linux-kernel
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/ethernet/qlogic/netxen/netxen_nic_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index 5bf0581..1159031 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -99,7 +99,7 @@ static int netxen_nic_set_mac(struct net_device *netdev, void *p);
{PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \
.class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0}
-static DEFINE_PCI_DEVICE_TABLE(netxen_pci_tbl) = {
+static const struct pci_device_id netxen_pci_tbl[] = {
ENTRY(PCI_DEVICE_ID_NX2031_10GXSR),
ENTRY(PCI_DEVICE_ID_NX2031_10GCX4),
ENTRY(PCI_DEVICE_ID_NX2031_4GCU),
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 11/25] pcnet32: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (7 preceding siblings ...)
2014-07-18 15:26 ` [PATCH 10/25] netxen: " Benoit Taine
@ 2014-07-18 15:26 ` Benoit Taine
2014-07-18 15:26 ` [PATCH 12/25] r8169: " Benoit Taine
` (12 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:26 UTC (permalink / raw)
To: Don Fry; +Cc: benoit.taine, netdev, linux-kernel
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/ethernet/amd/pcnet32.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index 4a8fdc4..e2e3aaf 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -61,7 +61,7 @@ static const char *const version =
/*
* PCI device identifiers for "new style" Linux PCI Device Drivers
*/
-static DEFINE_PCI_DEVICE_TABLE(pcnet32_pci_tbl) = {
+static const struct pci_device_id pcnet32_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE_HOME), },
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE), },
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 12/25] r8169: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (8 preceding siblings ...)
2014-07-18 15:26 ` [PATCH 11/25] pcnet32: " Benoit Taine
@ 2014-07-18 15:26 ` Benoit Taine
2014-07-18 15:27 ` [PATCH 14/25] adm8211: " Benoit Taine
` (11 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:26 UTC (permalink / raw)
To: Realtek linux nic maintainers; +Cc: benoit.taine, netdev, linux-kernel
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/ethernet/realtek/r8169.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 9887bcb..91652e7 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -291,7 +291,7 @@ enum cfg_version {
RTL_CFG_2
};
-static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = {
+static const struct pci_device_id rtl8169_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8129), 0, 0, RTL_CFG_0 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8136), 0, 0, RTL_CFG_2 },
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8167), 0, 0, RTL_CFG_0 },
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 14/25] adm8211: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (9 preceding siblings ...)
2014-07-18 15:26 ` [PATCH 12/25] r8169: " Benoit Taine
@ 2014-07-18 15:27 ` Benoit Taine
2014-07-18 15:27 ` [PATCH 15/25] qlcnic: " Benoit Taine
` (10 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:27 UTC (permalink / raw)
To: John W. Linville; +Cc: benoit.taine, linux-wireless, netdev, linux-kernel
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/adm8211.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index f35f93c..17fcaab 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -41,7 +41,7 @@ static unsigned int rx_ring_size __read_mostly = 16;
module_param(tx_ring_size, uint, 0);
module_param(rx_ring_size, uint, 0);
-static DEFINE_PCI_DEVICE_TABLE(adm8211_pci_id_table) = {
+static const struct pci_device_id adm8211_pci_id_table[] = {
/* ADMtek ADM8211 */
{ PCI_DEVICE(0x10B7, 0x6000) }, /* 3Com 3CRSHPW796 */
{ PCI_DEVICE(0x1200, 0x8201) }, /* ? */
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 15/25] qlcnic: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (10 preceding siblings ...)
2014-07-18 15:27 ` [PATCH 14/25] adm8211: " Benoit Taine
@ 2014-07-18 15:27 ` Benoit Taine
2014-07-18 15:27 ` [PATCH 16/25] be2net: " Benoit Taine
` (9 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:27 UTC (permalink / raw)
To: Shahed Shaikh; +Cc: benoit.taine, Dept-HSGLinuxNICDev, netdev, linux-kernel
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/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 0fdbcc8..2bf7d9d 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -108,7 +108,7 @@ static u32 qlcnic_vlan_tx_check(struct qlcnic_adapter *adapter)
{PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, (device)), \
.class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0}
-static DEFINE_PCI_DEVICE_TABLE(qlcnic_pci_tbl) = {
+static const struct pci_device_id qlcnic_pci_tbl[] = {
ENTRY(PCI_DEVICE_ID_QLOGIC_QLE824X),
ENTRY(PCI_DEVICE_ID_QLOGIC_QLE834X),
ENTRY(PCI_DEVICE_ID_QLOGIC_VF_QLE834X),
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 16/25] be2net: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (11 preceding siblings ...)
2014-07-18 15:27 ` [PATCH 15/25] qlcnic: " Benoit Taine
@ 2014-07-18 15:27 ` Benoit Taine
2014-07-18 15:27 ` [PATCH 18/25] smsc9420: " Benoit Taine
` (8 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:27 UTC (permalink / raw)
To: Sathya Perla
Cc: benoit.taine, Subbu Seetharaman, Ajit Khaparde, netdev,
linux-kernel
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/ethernet/emulex/benet/be_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 9bced68..04f2348 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -39,7 +39,7 @@ static ushort rx_frag_size = 2048;
module_param(rx_frag_size, ushort, S_IRUGO);
MODULE_PARM_DESC(rx_frag_size, "Size of a fragment that holds rcvd data.");
-static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = {
+static const struct pci_device_id be_dev_ids[] = {
{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) },
{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) },
{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 18/25] smsc9420: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (12 preceding siblings ...)
2014-07-18 15:27 ` [PATCH 16/25] be2net: " Benoit Taine
@ 2014-07-18 15:27 ` Benoit Taine
2014-07-18 15:27 ` [PATCH 19/25] irda: " Benoit Taine
` (7 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:27 UTC (permalink / raw)
To: Steve Glendinning; +Cc: benoit.taine, netdev, linux-kernel
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/ethernet/smsc/smsc9420.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/smsc/smsc9420.c b/drivers/net/ethernet/smsc/smsc9420.c
index d3b967a..4a90cda 100644
--- a/drivers/net/ethernet/smsc/smsc9420.c
+++ b/drivers/net/ethernet/smsc/smsc9420.c
@@ -83,7 +83,7 @@ struct smsc9420_pdata {
int last_carrier;
};
-static DEFINE_PCI_DEVICE_TABLE(smsc9420_id_table) = {
+static const struct pci_device_id smsc9420_id_table[] = {
{ PCI_VENDOR_ID_9420, PCI_DEVICE_ID_9420, PCI_ANY_ID, PCI_ANY_ID, },
{ 0, }
};
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 19/25] irda: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (13 preceding siblings ...)
2014-07-18 15:27 ` [PATCH 18/25] smsc9420: " Benoit Taine
@ 2014-07-18 15:27 ` Benoit Taine
2014-07-18 15:27 ` [PATCH 20/25] via-rhine: " Benoit Taine
` (6 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:27 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: benoit.taine, netdev, linux-kernel
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,
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 20/25] via-rhine: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (14 preceding siblings ...)
2014-07-18 15:27 ` [PATCH 19/25] irda: " Benoit Taine
@ 2014-07-18 15:27 ` Benoit Taine
2014-07-18 15:27 ` [PATCH 21/25] hostap: " Benoit Taine
` (5 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:27 UTC (permalink / raw)
To: Roger Luethi; +Cc: benoit.taine, netdev, linux-kernel
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/ethernet/via/via-rhine.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
index 2d72f96..68c5260 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -273,7 +273,7 @@ enum rhine_quirks {
/* Beware of PCI posted writes */
#define IOSYNC do { ioread8(ioaddr + StationAddr); } while (0)
-static DEFINE_PCI_DEVICE_TABLE(rhine_pci_tbl) = {
+static const struct pci_device_id rhine_pci_tbl[] = {
{ 0x1106, 0x3043, PCI_ANY_ID, PCI_ANY_ID, }, /* VT86C100A */
{ 0x1106, 0x3065, PCI_ANY_ID, PCI_ANY_ID, }, /* VT6102 */
{ 0x1106, 0x3106, PCI_ANY_ID, PCI_ANY_ID, }, /* 6105{,L,LOM} */
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 21/25] hostap: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (15 preceding siblings ...)
2014-07-18 15:27 ` [PATCH 20/25] via-rhine: " Benoit Taine
@ 2014-07-18 15:27 ` Benoit Taine
2014-07-18 15:27 ` [PATCH 22/25] drivers/net: " Benoit Taine
` (4 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:27 UTC (permalink / raw)
To: Jouni Malinen
Cc: benoit.taine, John W. Linville, linux-wireless, netdev,
linux-kernel
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"),
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 22/25] drivers/net: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (16 preceding siblings ...)
2014-07-18 15:27 ` [PATCH 21/25] hostap: " Benoit Taine
@ 2014-07-18 15:27 ` Benoit Taine
2014-07-18 15:27 ` [PATCH 24/25] starfire: " Benoit Taine
` (3 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:27 UTC (permalink / raw)
To: netdev; +Cc: benoit.taine, linux-kernel
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/arcnet/com20020-pci.c | 2 +-
drivers/net/ethernet/chelsio/cxgb/subr.c | 2 +-
drivers/net/ethernet/dlink/dl2k.h | 2 +-
drivers/net/ethernet/fealnx.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/main.c | 2 +-
drivers/net/ethernet/micrel/ksz884x.c | 2 +-
drivers/net/ethernet/natsemi/ns83820.c | 2 +-
drivers/net/ethernet/nvidia/forcedeth.c | 2 +-
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +-
drivers/net/ethernet/packetengines/hamachi.c | 2 +-
drivers/net/ethernet/packetengines/yellowfin.c | 2 +-
drivers/net/ethernet/realtek/8139cp.c | 2 +-
drivers/net/ethernet/realtek/8139too.c | 2 +-
drivers/net/ethernet/silan/sc92031.c | 2 +-
drivers/net/ethernet/smsc/epic100.c | 2 +-
drivers/net/ethernet/sun/cassini.c | 2 +-
drivers/net/ethernet/sun/niu.c | 2 +-
drivers/net/ethernet/sun/sungem.c | 2 +-
drivers/net/ethernet/sun/sunhme.c | 2 +-
drivers/net/ethernet/toshiba/tc35815.c | 2 +-
drivers/net/fddi/skfp/skfddi.c | 2 +-
drivers/net/wan/lmc/lmc_main.c | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index cbc44f5..7bb292e 100644
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -144,7 +144,7 @@ static void com20020pci_remove(struct pci_dev *pdev)
free_netdev(dev);
}
-static DEFINE_PCI_DEVICE_TABLE(com20020pci_id_table) = {
+static const struct pci_device_id com20020pci_id_table[] = {
{ 0x1571, 0xa001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0x1571, 0xa002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0x1571, 0xa003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
diff --git a/drivers/net/ethernet/chelsio/cxgb/subr.c b/drivers/net/ethernet/chelsio/cxgb/subr.c
index 8167193..ea0f874 100644
--- a/drivers/net/ethernet/chelsio/cxgb/subr.c
+++ b/drivers/net/ethernet/chelsio/cxgb/subr.c
@@ -522,7 +522,7 @@ static const struct board_info t1_board[] = {
};
-DEFINE_PCI_DEVICE_TABLE(t1_pci_tbl) = {
+const struct pci_device_id t1_pci_tbl[] = {
CH_DEVICE(8, 0, CH_BRD_T110_1CU),
CH_DEVICE(8, 1, CH_BRD_T110_1CU),
CH_DEVICE(7, 0, CH_BRD_N110_1F),
diff --git a/drivers/net/ethernet/dlink/dl2k.h b/drivers/net/ethernet/dlink/dl2k.h
index 7d07a0f..23c07b0 100644
--- a/drivers/net/ethernet/dlink/dl2k.h
+++ b/drivers/net/ethernet/dlink/dl2k.h
@@ -408,7 +408,7 @@ struct netdev_private {
driver_data Data private to the driver.
*/
-static DEFINE_PCI_DEVICE_TABLE(rio_pci_tbl) = {
+static const struct pci_device_id rio_pci_tbl[] = {
{0x1186, 0x4000, PCI_ANY_ID, PCI_ANY_ID, },
{0x13f0, 0x1021, PCI_ANY_ID, PCI_ANY_ID, },
{ }
diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
index 4b22a95..b1b9eba 100644
--- a/drivers/net/ethernet/fealnx.c
+++ b/drivers/net/ethernet/fealnx.c
@@ -1936,7 +1936,7 @@ static int netdev_close(struct net_device *dev)
return 0;
}
-static DEFINE_PCI_DEVICE_TABLE(fealnx_pci_tbl) = {
+static const struct pci_device_id fealnx_pci_tbl[] = {
{0x1516, 0x0800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0x1516, 0x0803, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
{0x1516, 0x0891, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 82ab427..e854b79 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -2705,7 +2705,7 @@ int mlx4_restart_one(struct pci_dev *pdev)
return __mlx4_init_one(pdev, pci_dev_data);
}
-static DEFINE_PCI_DEVICE_TABLE(mlx4_pci_table) = {
+static const struct pci_device_id mlx4_pci_table[] = {
/* MT25408 "Hermon" SDR */
{ PCI_VDEVICE(MELLANOX, 0x6340), MLX4_PCI_DEV_FORCE_SENSE_PORT },
/* MT25408 "Hermon" DDR */
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index cd5f106..f1ebed6c 100644
--- a/drivers/net/ethernet/micrel/ksz884x.c
+++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -7221,7 +7221,7 @@ static int pcidev_suspend(struct pci_dev *pdev, pm_message_t state)
static char pcidev_name[] = "ksz884xp";
-static DEFINE_PCI_DEVICE_TABLE(pcidev_table) = {
+static const struct pci_device_id pcidev_table[] = {
{ PCI_VENDOR_ID_MICREL_KS, 0x8841,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_MICREL_KS, 0x8842,
diff --git a/drivers/net/ethernet/natsemi/ns83820.c b/drivers/net/ethernet/natsemi/ns83820.c
index 19bb824..2552e55 100644
--- a/drivers/net/ethernet/natsemi/ns83820.c
+++ b/drivers/net/ethernet/natsemi/ns83820.c
@@ -2260,7 +2260,7 @@ static void ns83820_remove_one(struct pci_dev *pci_dev)
free_netdev(ndev);
}
-static DEFINE_PCI_DEVICE_TABLE(ns83820_pci_tbl) = {
+static const struct pci_device_id ns83820_pci_tbl[] = {
{ 0x100b, 0x0022, PCI_ANY_ID, PCI_ANY_ID, 0, .driver_data = 0, },
{ 0, },
};
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 9afc536..925b296 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -6185,7 +6185,7 @@ static void nv_shutdown(struct pci_dev *pdev)
#define nv_shutdown NULL
#endif /* CONFIG_PM */
-static DEFINE_PCI_DEVICE_TABLE(pci_tbl) = {
+static const struct pci_device_id pci_tbl[] = {
{ /* nForce Ethernet Controller */
PCI_DEVICE(0x10DE, 0x01C3),
.driver_data = DEV_NEED_TIMERIRQ|DEV_NEED_LINKTIMER,
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 73e6683..3b98b263b 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -2743,7 +2743,7 @@ static struct pch_gbe_privdata pch_gbe_minnow_privdata = {
.platform_init = pch_gbe_minnow_platform_init,
};
-static DEFINE_PCI_DEVICE_TABLE(pch_gbe_pcidev_id) = {
+static const struct pci_device_id pch_gbe_pcidev_id[] = {
{.vendor = PCI_VENDOR_ID_INTEL,
.device = PCI_DEVICE_ID_INTEL_IOH1_GBE,
.subvendor = PCI_VENDOR_ID_CIRCUITCO,
diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c
index 9a997e4..319d9d4 100644
--- a/drivers/net/ethernet/packetengines/hamachi.c
+++ b/drivers/net/ethernet/packetengines/hamachi.c
@@ -1911,7 +1911,7 @@ static void hamachi_remove_one(struct pci_dev *pdev)
}
}
-static DEFINE_PCI_DEVICE_TABLE(hamachi_pci_tbl) = {
+static const struct pci_device_id hamachi_pci_tbl[] = {
{ 0x1318, 0x0911, PCI_ANY_ID, PCI_ANY_ID, },
{ 0, }
};
diff --git a/drivers/net/ethernet/packetengines/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c
index 69a8dc0..2d6b148 100644
--- a/drivers/net/ethernet/packetengines/yellowfin.c
+++ b/drivers/net/ethernet/packetengines/yellowfin.c
@@ -236,7 +236,7 @@ static const struct pci_id_info pci_id_tbl[] = {
{ }
};
-static DEFINE_PCI_DEVICE_TABLE(yellowfin_pci_tbl) = {
+static const struct pci_device_id yellowfin_pci_tbl[] = {
{ 0x1000, 0x0702, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ 0x1000, 0x0701, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
{ }
diff --git a/drivers/net/ethernet/realtek/8139cp.c b/drivers/net/ethernet/realtek/8139cp.c
index 2bc728e..8af9460 100644
--- a/drivers/net/ethernet/realtek/8139cp.c
+++ b/drivers/net/ethernet/realtek/8139cp.c
@@ -382,7 +382,7 @@ static int cp_get_eeprom(struct net_device *dev,
static int cp_set_eeprom(struct net_device *dev,
struct ethtool_eeprom *eeprom, u8 *data);
-static DEFINE_PCI_DEVICE_TABLE(cp_pci_tbl) = {
+static const struct pci_device_id cp_pci_tbl[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_8139), },
{ PCI_DEVICE(PCI_VENDOR_ID_TTTECH, PCI_DEVICE_ID_TTTECH_MC322), },
{ },
diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index 2e5df14..007b38c 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -234,7 +234,7 @@ static const struct {
};
-static DEFINE_PCI_DEVICE_TABLE(rtl8139_pci_tbl) = {
+static const struct pci_device_id rtl8139_pci_tbl[] = {
{0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
{0x10ec, 0x8138, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
{0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
diff --git a/drivers/net/ethernet/silan/sc92031.c b/drivers/net/ethernet/silan/sc92031.c
index 7daa7d4..7426f8b 100644
--- a/drivers/net/ethernet/silan/sc92031.c
+++ b/drivers/net/ethernet/silan/sc92031.c
@@ -1561,7 +1561,7 @@ out:
return 0;
}
-static DEFINE_PCI_DEVICE_TABLE(sc92031_pci_device_id_table) = {
+static const struct pci_device_id sc92031_pci_device_id_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x2031) },
{ PCI_DEVICE(PCI_VENDOR_ID_SILAN, 0x8139) },
{ PCI_DEVICE(0x1088, 0x2031) },
diff --git a/drivers/net/ethernet/smsc/epic100.c b/drivers/net/ethernet/smsc/epic100.c
index 8ae1f8a7..443f1da 100644
--- a/drivers/net/ethernet/smsc/epic100.c
+++ b/drivers/net/ethernet/smsc/epic100.c
@@ -173,7 +173,7 @@ static const struct epic_chip_info pci_id_tbl[] = {
};
-static DEFINE_PCI_DEVICE_TABLE(epic_pci_tbl) = {
+static const struct pci_device_id epic_pci_tbl[] = {
{ 0x10B8, 0x0005, 0x1092, 0x0AB4, 0, 0, SMSC_83C170_0 },
{ 0x10B8, 0x0005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SMSC_83C170 },
{ 0x10B8, 0x0006, PCI_ANY_ID, PCI_ANY_ID,
diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c
index b9ac20f..37f87ff 100644
--- a/drivers/net/ethernet/sun/cassini.c
+++ b/drivers/net/ethernet/sun/cassini.c
@@ -229,7 +229,7 @@ static u16 link_modes[] = {
CAS_BMCR_SPEED1000|BMCR_FULLDPLX /* 5 : 1000bt full duplex */
};
-static DEFINE_PCI_DEVICE_TABLE(cas_pci_tbl) = {
+static const struct pci_device_id cas_pci_tbl[] = {
{ PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_CASSINI,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SATURN,
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index 79606f47a..0251d47 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -59,7 +59,7 @@ static void writeq(u64 val, void __iomem *reg)
}
#endif
-static DEFINE_PCI_DEVICE_TABLE(niu_pci_tbl) = {
+static const struct pci_device_id niu_pci_tbl[] = {
{PCI_DEVICE(PCI_VENDOR_ID_SUN, 0xabcd)},
{}
};
diff --git a/drivers/net/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c
index 102a66f..f7415b6 100644
--- a/drivers/net/ethernet/sun/sungem.c
+++ b/drivers/net/ethernet/sun/sungem.c
@@ -85,7 +85,7 @@ MODULE_LICENSE("GPL");
#define GEM_MODULE_NAME "gem"
-static DEFINE_PCI_DEVICE_TABLE(gem_pci_tbl) = {
+static const struct pci_device_id gem_pci_tbl[] = {
{ PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_GEM,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c
index 0dbf46f..72c8525 100644
--- a/drivers/net/ethernet/sun/sunhme.c
+++ b/drivers/net/ethernet/sun/sunhme.c
@@ -3172,7 +3172,7 @@ static void happy_meal_pci_remove(struct pci_dev *pdev)
free_netdev(net_dev);
}
-static DEFINE_PCI_DEVICE_TABLE(happymeal_pci_ids) = {
+static const struct pci_device_id happymeal_pci_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_HAPPYMEAL) },
{ } /* Terminating entry */
};
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c
index fef5573..45ac38d 100644
--- a/drivers/net/ethernet/toshiba/tc35815.c
+++ b/drivers/net/ethernet/toshiba/tc35815.c
@@ -65,7 +65,7 @@ static const struct {
{ "TOSHIBA TC35815/TX4939" },
};
-static DEFINE_PCI_DEVICE_TABLE(tc35815_pci_tbl) = {
+static const struct pci_device_id tc35815_pci_tbl[] = {
{PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815CF), .driver_data = TC35815CF },
{PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815_NWU), .driver_data = TC35815_NWU },
{PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_TC35815_TX4939), .driver_data = TC35815_TX4939 },
diff --git a/drivers/net/fddi/skfp/skfddi.c b/drivers/net/fddi/skfp/skfddi.c
index d5f5812..51acc6d 100644
--- a/drivers/net/fddi/skfp/skfddi.c
+++ b/drivers/net/fddi/skfp/skfddi.c
@@ -149,7 +149,7 @@ extern void mac_drv_rx_mode(struct s_smc *smc, int mode);
extern void mac_drv_clear_rx_queue(struct s_smc *smc);
extern void enable_tx_irq(struct s_smc *smc, u_short queue);
-static DEFINE_PCI_DEVICE_TABLE(skfddi_pci_tbl) = {
+static const struct pci_device_id skfddi_pci_tbl[] = {
{ PCI_VENDOR_ID_SK, PCI_DEVICE_ID_SK_FP, PCI_ANY_ID, PCI_ANY_ID, },
{ } /* Terminating entry */
};
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index b2fe9bb..bea0f31 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -76,7 +76,7 @@
static int LMC_PKT_BUF_SZ = 1542;
-static DEFINE_PCI_DEVICE_TABLE(lmc_pci_tbl) = {
+static const struct pci_device_id lmc_pci_tbl[] = {
{ PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST,
PCI_VENDOR_ID_LMC, PCI_ANY_ID },
{ PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST,
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 24/25] starfire: Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (17 preceding siblings ...)
2014-07-18 15:27 ` [PATCH 22/25] drivers/net: " Benoit Taine
@ 2014-07-18 15:27 ` Benoit Taine
2014-07-18 16:22 ` [PATCH 0/25] " John W. Linville
` (2 subsequent siblings)
21 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-18 15:27 UTC (permalink / raw)
To: Ion Badulescu; +Cc: benoit.taine, netdev, linux-kernel
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/ethernet/adaptec/starfire.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/adaptec/starfire.c b/drivers/net/ethernet/adaptec/starfire.c
index 40dbbf7..ac72882 100644
--- a/drivers/net/ethernet/adaptec/starfire.c
+++ b/drivers/net/ethernet/adaptec/starfire.c
@@ -285,7 +285,7 @@ enum chipset {
CH_6915 = 0,
};
-static DEFINE_PCI_DEVICE_TABLE(starfire_pci_tbl) = {
+static const struct pci_device_id starfire_pci_tbl[] = {
{ PCI_VDEVICE(ADAPTEC, 0x6915), CH_6915 },
{ 0, }
};
^ permalink raw reply related [flat|nested] 33+ messages in thread* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (18 preceding siblings ...)
2014-07-18 15:27 ` [PATCH 24/25] starfire: " Benoit Taine
@ 2014-07-18 16:22 ` John W. Linville
2014-07-18 16:43 ` Greg KH
2014-07-18 16:28 ` James Bottomley
2014-07-21 4:18 ` David Miller
21 siblings, 1 reply; 33+ messages in thread
From: John W. Linville @ 2014-07-18 16:22 UTC (permalink / raw)
To: Benoit Taine
Cc: linux-mips, linux-fbdev, linux-pci, dri-devel, linux-kernel,
ath5k-devel, MPT-FusionLinux.pdl, linux-acenic, linux-scsi,
linux-rdma, ath10k, linux-hippi, industrypack-devel, linux-mmc,
virtualization, ath9k-devel, wil6210, linux-pcmcia, linux-can,
xen-devel, platform-driver-x86, netdev, linux-wireless, users,
e1000-devel, linux-crypto, devel
On Fri, Jul 18, 2014 at 05:26:47PM +0200, Benoit Taine wrote:
> We should prefer `const struct pci_device_id` over
> `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines.
> This issue was reported by checkpatch.
Honestly, I prefer the macro -- it stands-out more. Maybe the style
guidelines and/or checkpatch should change instead?
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
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:05 ` Joe Perches
0 siblings, 2 replies; 33+ messages in thread
From: Greg KH @ 2014-07-18 16:43 UTC (permalink / raw)
To: John W. Linville
Cc: linux-mips, linux-fbdev, linux-pci, dri-devel,
platform-driver-x86, Benoit Taine, ath5k-devel, linux-acenic,
linux-scsi, users, linux-rdma, ath10k, linux-hippi,
industrypack-devel, linux-wireless, xen-devel,
MPT-FusionLinux.pdl, ath9k-devel, wil6210, linux-pcmcia,
linux-can, virtualization, netdev, linux-mmc, linux-kernel,
e1000-devel, linux-crypto, devel
On Fri, Jul 18, 2014 at 12:22:13PM -0400, John W. Linville wrote:
> On Fri, Jul 18, 2014 at 05:26:47PM +0200, Benoit Taine wrote:
> > We should prefer `const struct pci_device_id` over
> > `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines.
> > This issue was reported by checkpatch.
>
> Honestly, I prefer the macro -- it stands-out more. Maybe the style
> guidelines and/or checkpatch should change instead?
The macro is horrid, no other bus has this type of thing just to save a
few characters in typing, so why should PCI be "special" in this regard
anymore?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
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:05 ` Joe Perches
1 sibling, 1 reply; 33+ messages in thread
From: James Bottomley @ 2014-07-18 16:54 UTC (permalink / raw)
To: Greg KH
Cc: linux-mips, linux-fbdev, linux-pci, dri-devel, virtualization,
Benoit Taine, ath5k-devel, linux-acenic, linux-scsi, users,
linux-rdma, ath10k, linux-hippi, industrypack-devel,
linux-wireless, xen-devel, MPT-FusionLinux.pdl, ath9k-devel,
wil6210, linux-pcmcia, John W. Linville, linux-can,
platform-driver-x86, netdev, linux-mmc, linux-kernel, e1000-devel,
linux-crypto, devel
On Fri, 2014-07-18 at 09:43 -0700, Greg KH wrote:
> On Fri, Jul 18, 2014 at 12:22:13PM -0400, John W. Linville wrote:
> > On Fri, Jul 18, 2014 at 05:26:47PM +0200, Benoit Taine wrote:
> > > We should prefer `const struct pci_device_id` over
> > > `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines.
> > > This issue was reported by checkpatch.
> >
> > Honestly, I prefer the macro -- it stands-out more. Maybe the style
> > guidelines and/or checkpatch should change instead?
>
> The macro is horrid, no other bus has this type of thing just to save a
> few characters in typing
OK, so this is the macro:
#define DEFINE_PCI_DEVICE_TABLE(_table) \
const struct pci_device_id _table[]
Could you explain what's so horrible?
The reason it's useful today is that people forget the const (and
sometimes the [] making it a true table instead of a pointer). If you
use the DEFINE_PCI_DEVICE_TABLE macro, the compile breaks if you use it
wrongly (good) and you automatically get the correct annotations.
> , so why should PCI be "special" in this regard
> anymore?
I think the PCI usage dwarfs most other bus types now, so you could turn
the question around. However, I don't think majority voting is a good
guide to best practise; lets debate the merits for their own sake.
James
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 16:54 ` James Bottomley
@ 2014-07-18 18:17 ` Greg KH
2014-07-18 18:50 ` James Bottomley
2014-07-18 21:14 ` Dave Airlie
0 siblings, 2 replies; 33+ messages in thread
From: Greg KH @ 2014-07-18 18:17 UTC (permalink / raw)
To: James Bottomley
Cc: John W. Linville, Benoit Taine, linux-mips, linux-fbdev,
linux-pci, dri-devel, linux-kernel, ath5k-devel, linux-acenic,
linux-scsi, linux-rdma, ath10k, linux-hippi, industrypack-devel,
linux-mmc, MPT-FusionLinux.pdl, virtualization, ath9k-devel,
wil6210, linux-pcmcia, linux-can, xen-devel, platform-driver-x86,
netdev, linux-wireless, users, e1000-devel, linux-crypto, deve
On Fri, Jul 18, 2014 at 09:54:32AM -0700, James Bottomley wrote:
> On Fri, 2014-07-18 at 09:43 -0700, Greg KH wrote:
> > On Fri, Jul 18, 2014 at 12:22:13PM -0400, John W. Linville wrote:
> > > On Fri, Jul 18, 2014 at 05:26:47PM +0200, Benoit Taine wrote:
> > > > We should prefer `const struct pci_device_id` over
> > > > `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines.
> > > > This issue was reported by checkpatch.
> > >
> > > Honestly, I prefer the macro -- it stands-out more. Maybe the style
> > > guidelines and/or checkpatch should change instead?
> >
> > The macro is horrid, no other bus has this type of thing just to save a
> > few characters in typing
>
> OK, so this is the macro:
>
> #define DEFINE_PCI_DEVICE_TABLE(_table) \
> const struct pci_device_id _table[]
>
> Could you explain what's so horrible?
>
> The reason it's useful today is that people forget the const (and
> sometimes the [] making it a true table instead of a pointer). If you
> use the DEFINE_PCI_DEVICE_TABLE macro, the compile breaks if you use it
> wrongly (good) and you automatically get the correct annotations.
We have almost 1000 more uses of the non-macro version than the "macro"
version in the kernel today:
$ git grep -w DEFINE_PCI_DEVICE_TABLE | wc -l
262
$ git grep "const struct pci_device_id" | wc -l
1254
My big complaint is that we need to be consistant, either pick one or
the other and stick to it. As the macro is the least used, it's easiest
to fix up, and it also is more consistant with all other kernel
subsystems which do not have such a macro.
As there is no need for the __init macro mess anymore, there's no real
need for the DEFINE_PCI_DEVICE_TABLE macro either. I think checkpatch
will catch the use of non-const users for the id table already today, it
catches lots of other uses like this already.
> > , so why should PCI be "special" in this regard
> > anymore?
>
> I think the PCI usage dwarfs most other bus types now, so you could turn
> the question around. However, I don't think majority voting is a good
> guide to best practise; lets debate the merits for their own sake.
Not really "dwarf", USB is close with over 700 such structures:
$ git grep "const struct usb_device_id" | wc -l
725
And i2c is almost just as big as PCI:
$ git grep "const struct i2c_device_id" | wc -l
1223
So again, this macro is not consistent with the majority of PCI drivers,
nor with any other type of "device id" declaration in the kernel, which
is why I feel it should be removed.
And finally, the PCI documentation itself says to not use this macro, so
this isn't a "new" thing. From Documentation/PCI/pci.txt:
The ID table is an array of struct pci_device_id entries ending with an
all-zero entry. Definitions with static const are generally preferred.
Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.
That wording went into the file last December, when we last talked about
this and everyone in that discussion agreed to remove the macro for the
above reasons.
Consistency matters.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 18:17 ` Greg KH
@ 2014-07-18 18:50 ` James Bottomley
2014-07-21 23:16 ` Bjorn Helgaas
2014-07-18 21:14 ` Dave Airlie
1 sibling, 1 reply; 33+ messages in thread
From: James Bottomley @ 2014-07-18 18:50 UTC (permalink / raw)
To: Greg KH
Cc: John W. Linville, Benoit Taine, linux-mips, linux-fbdev,
linux-pci, dri-devel, linux-kernel, ath5k-devel, linux-acenic,
linux-scsi, linux-rdma, ath10k, linux-hippi, industrypack-devel,
linux-mmc, MPT-FusionLinux.pdl, virtualization, ath9k-devel,
wil6210, linux-pcmcia, linux-can, xen-devel, platform-driver-x86,
netdev, linux-wireless, users, e1000-devel, linux-crypto, deve
On Fri, 2014-07-18 at 11:17 -0700, Greg KH wrote:
> On Fri, Jul 18, 2014 at 09:54:32AM -0700, James Bottomley wrote:
> > On Fri, 2014-07-18 at 09:43 -0700, Greg KH wrote:
> > > On Fri, Jul 18, 2014 at 12:22:13PM -0400, John W. Linville wrote:
> > > > On Fri, Jul 18, 2014 at 05:26:47PM +0200, Benoit Taine wrote:
> > > > > We should prefer `const struct pci_device_id` over
> > > > > `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines.
> > > > > This issue was reported by checkpatch.
> > > >
> > > > Honestly, I prefer the macro -- it stands-out more. Maybe the style
> > > > guidelines and/or checkpatch should change instead?
> > >
> > > The macro is horrid, no other bus has this type of thing just to save a
> > > few characters in typing
> >
> > OK, so this is the macro:
> >
> > #define DEFINE_PCI_DEVICE_TABLE(_table) \
> > const struct pci_device_id _table[]
> >
> > Could you explain what's so horrible?
> >
> > The reason it's useful today is that people forget the const (and
> > sometimes the [] making it a true table instead of a pointer). If you
> > use the DEFINE_PCI_DEVICE_TABLE macro, the compile breaks if you use it
> > wrongly (good) and you automatically get the correct annotations.
>
> We have almost 1000 more uses of the non-macro version than the "macro"
> version in the kernel today:
> $ git grep -w DEFINE_PCI_DEVICE_TABLE | wc -l
> 262
> $ git grep "const struct pci_device_id" | wc -l
> 1254
>
> My big complaint is that we need to be consistant, either pick one or
> the other and stick to it. As the macro is the least used, it's easiest
> to fix up, and it also is more consistant with all other kernel
> subsystems which do not have such a macro.
I've a weak preference for consistency, but not at the expense of
hundreds of patches churning the kernel to remove an innocuous macro.
Churn costs time and effort.
> As there is no need for the __init macro mess anymore, there's no real
> need for the DEFINE_PCI_DEVICE_TABLE macro either. I think checkpatch
> will catch the use of non-const users for the id table already today, it
> catches lots of other uses like this already.
>
> > > , so why should PCI be "special" in this regard
> > > anymore?
> >
> > I think the PCI usage dwarfs most other bus types now, so you could turn
> > the question around. However, I don't think majority voting is a good
> > guide to best practise; lets debate the merits for their own sake.
>
> Not really "dwarf", USB is close with over 700 such structures:
> $ git grep "const struct usb_device_id" | wc -l
> 725
>
> And i2c is almost just as big as PCI:
> $ git grep "const struct i2c_device_id" | wc -l
> 1223
>
> So again, this macro is not consistent with the majority of PCI drivers,
> nor with any other type of "device id" declaration in the kernel, which
> is why I feel it should be removed.
>
> And finally, the PCI documentation itself says to not use this macro, so
> this isn't a "new" thing. From Documentation/PCI/pci.txt:
>
> The ID table is an array of struct pci_device_id entries ending with an
> all-zero entry. Definitions with static const are generally preferred.
> Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.
>
> That wording went into the file last December, when we last talked about
> this and everyone in that discussion agreed to remove the macro for the
> above reasons.
>
> Consistency matters.
In this case, I don't think it does that much ... a cut and paste either
way (from a macro or non-macro based driver) yields correct code. Since
there's no bug here and no apparent way to misuse the macro, why bother?
Anyway, it's PCI code ... let the PCI maintainer decide. However, if he
does want this do it as one big bang patch via either the PCI or Trivial
tree (latter because Jiří has experience doing this, but the former
might be useful so the decider feels the pain ...)
James
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 18:50 ` James Bottomley
@ 2014-07-21 23:16 ` Bjorn Helgaas
2014-07-22 17:12 ` Benoit Taine
0 siblings, 1 reply; 33+ messages in thread
From: Bjorn Helgaas @ 2014-07-21 23:16 UTC (permalink / raw)
To: James Bottomley
Cc: linux-mips@linux-mips.org, linux-fbdev, linux-pci@vger.kernel.org,
DRI mailing list, virtualization, Benoit Taine, ath5k-devel,
linux-acenic, linux-scsi@vger.kernel.org, users,
linux-rdma@vger.kernel.org, Jingoo Han, ath10k, linux-hippi,
industrypack-devel, Greg KH, linux-wireless,
xen-devel@lists.xenproject.org, MPT-FusionLinux.pdl, ath9k-devel,
wil6210, linux-pcmcia, "John
[+cc Jingoo]
On Fri, Jul 18, 2014 at 12:50 PM, James Bottomley
<James.Bottomley@hansenpartnership.com> wrote:
> On Fri, 2014-07-18 at 11:17 -0700, Greg KH wrote:
>> On Fri, Jul 18, 2014 at 09:54:32AM -0700, James Bottomley wrote:
>> > On Fri, 2014-07-18 at 09:43 -0700, Greg KH wrote:
>> > > On Fri, Jul 18, 2014 at 12:22:13PM -0400, John W. Linville wrote:
>> > > > On Fri, Jul 18, 2014 at 05:26:47PM +0200, Benoit Taine wrote:
>> > > > > We should prefer `const struct pci_device_id` over
>> > > > > `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines.
>> > > > > This issue was reported by checkpatch.
>> > > >
>> > > > Honestly, I prefer the macro -- it stands-out more. Maybe the style
>> > > > guidelines and/or checkpatch should change instead?
>> > >
>> > > The macro is horrid, no other bus has this type of thing just to save a
>> > > few characters in typing
>> >
>> > OK, so this is the macro:
>> >
>> > #define DEFINE_PCI_DEVICE_TABLE(_table) \
>> > const struct pci_device_id _table[]
>> >
>> > Could you explain what's so horrible?
>> >
>> > The reason it's useful today is that people forget the const (and
>> > sometimes the [] making it a true table instead of a pointer). If you
>> > use the DEFINE_PCI_DEVICE_TABLE macro, the compile breaks if you use it
>> > wrongly (good) and you automatically get the correct annotations.
>>
>> We have almost 1000 more uses of the non-macro version than the "macro"
>> version in the kernel today:
>> $ git grep -w DEFINE_PCI_DEVICE_TABLE | wc -l
>> 262
>> $ git grep "const struct pci_device_id" | wc -l
>> 1254
>>
>> My big complaint is that we need to be consistant, either pick one or
>> the other and stick to it. As the macro is the least used, it's easiest
>> to fix up, and it also is more consistant with all other kernel
>> subsystems which do not have such a macro.
>
> I've a weak preference for consistency, but not at the expense of
> hundreds of patches churning the kernel to remove an innocuous macro.
> Churn costs time and effort.
>
>> As there is no need for the __init macro mess anymore, there's no real
>> need for the DEFINE_PCI_DEVICE_TABLE macro either. I think checkpatch
>> will catch the use of non-const users for the id table already today, it
>> catches lots of other uses like this already.
>>
>> > > , so why should PCI be "special" in this regard
>> > > anymore?
>> >
>> > I think the PCI usage dwarfs most other bus types now, so you could turn
>> > the question around. However, I don't think majority voting is a good
>> > guide to best practise; lets debate the merits for their own sake.
>>
>> Not really "dwarf", USB is close with over 700 such structures:
>> $ git grep "const struct usb_device_id" | wc -l
>> 725
>>
>> And i2c is almost just as big as PCI:
>> $ git grep "const struct i2c_device_id" | wc -l
>> 1223
>>
>> So again, this macro is not consistent with the majority of PCI drivers,
>> nor with any other type of "device id" declaration in the kernel, which
>> is why I feel it should be removed.
>>
>> And finally, the PCI documentation itself says to not use this macro, so
>> this isn't a "new" thing. From Documentation/PCI/pci.txt:
>>
>> The ID table is an array of struct pci_device_id entries ending with an
>> all-zero entry. Definitions with static const are generally preferred.
>> Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.
>>
>> That wording went into the file last December, when we last talked about
>> this and everyone in that discussion agreed to remove the macro for the
>> above reasons.
>>
>> Consistency matters.
>
> In this case, I don't think it does that much ... a cut and paste either
> way (from a macro or non-macro based driver) yields correct code. Since
> there's no bug here and no apparent way to misuse the macro, why bother?
>
> Anyway, it's PCI code ... let the PCI maintainer decide. However, if he
> does want this do it as one big bang patch via either the PCI or Trivial
> tree (latter because Jiří has experience doing this, but the former
> might be useful so the decider feels the pain ...)
I don't feel strongly either way, so I guess I'm OK with this, and in
the spirit of feeling the pain, I'm willing to handle it. Jingoo
proposed similar patches, so it might be nice to give him some credit.
Benoit, how about if you wait until about half-way through the merge
window after v3.16 releases, generate an up-to-date single patch, and
post that? Then we can try to get it in before v3.17-rc1 to minimize
merge hassles.
Bjorn
_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-21 23:16 ` Bjorn Helgaas
@ 2014-07-22 17:12 ` Benoit Taine
0 siblings, 0 replies; 33+ messages in thread
From: Benoit Taine @ 2014-07-22 17:12 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: linux-mips@linux-mips.org, linux-fbdev, DRI mailing list,
virtualization, James Bottomley, ath5k-devel, linux-acenic,
linux-scsi@vger.kernel.org, users, linux-rdma@vger.kernel.org,
Jingoo Han, ath10k, linux-hippi, industrypack-devel,
linux-pci@vger.kernel.org, linux-wireless,
xen-devel@lists.xenproject.org, MPT-FusionLinux.pdl, ath9k-devel,
wil6210, linux-pcmcia, "John W. Lin
On 21/07/2014 17:16, Bjorn Helgaas wrote:
> [+cc Jingoo]
>
> On Fri, Jul 18, 2014 at 12:50 PM, James Bottomley
> > Anyway, it's PCI code ... let the PCI maintainer decide. However, if he
> > does want this do it as one big bang patch via either the PCI or Trivial
> > tree (latter because Jiří has experience doing this, but the former
> > might be useful so the decider feels the pain ...)
>
> I don't feel strongly either way, so I guess I'm OK with this, and in
> the spirit of feeling the pain, I'm willing to handle it. Jingoo
> proposed similar patches, so it might be nice to give him some credit.
>
> Benoit, how about if you wait until about half-way through the merge
> window after v3.16 releases, generate an up-to-date single patch, and
> post that? Then we can try to get it in before v3.17-rc1 to minimize
> merge hassles.
Sure, I will do this.
--
Benoît Taine
Master cycle intern
Regal Team. LIP6
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 18:17 ` Greg KH
2014-07-18 18:50 ` James Bottomley
@ 2014-07-18 21:14 ` Dave Airlie
2014-07-18 21:27 ` Greg KH
1 sibling, 1 reply; 33+ messages in thread
From: Dave Airlie @ 2014-07-18 21:14 UTC (permalink / raw)
To: Greg KH
Cc: linux-mips, Linux Fbdev development list, linux-pci, dri-devel,
virtualization, James Bottomley, Benoit Taine, ath5k-devel,
linux-acenic, Linux SCSI List, users, linux-rdma, ath10k,
linux-hippi, industrypack-devel, Linux Wireless List, xen-devel,
MPT-FusionLinux.pdl, ath9k-devel, wil6210, linux-pcmcia,
John W. Linville, linux-can, platform-driver-x86, Network
>
> We have almost 1000 more uses of the non-macro version than the "macro"
> version in the kernel today:
> $ git grep -w DEFINE_PCI_DEVICE_TABLE | wc -l
> 262
> $ git grep "const struct pci_device_id" | wc -l
> 1254
did you check for non-const ones? just to see if we have any of the
broken case in the tree :-)
as for consistency, pci_dev vs usb_device :-P
Dave.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 21:14 ` Dave Airlie
@ 2014-07-18 21:27 ` Greg KH
0 siblings, 0 replies; 33+ messages in thread
From: Greg KH @ 2014-07-18 21:27 UTC (permalink / raw)
To: Dave Airlie
Cc: linux-mips, Linux Fbdev development list, linux-pci, dri-devel,
virtualization, James Bottomley, Benoit Taine, ath5k-devel,
linux-acenic, Linux SCSI List, users, linux-rdma, ath10k,
linux-hippi, industrypack-devel, Linux Wireless List, xen-devel,
MPT-FusionLinux.pdl, ath9k-devel, wil6210, linux-pcmcia,
John W. Linville, linux-can, platform-driver-x86, Network
On Sat, Jul 19, 2014 at 07:14:12AM +1000, Dave Airlie wrote:
> >
> > We have almost 1000 more uses of the non-macro version than the "macro"
> > version in the kernel today:
> > $ git grep -w DEFINE_PCI_DEVICE_TABLE | wc -l
> > 262
> > $ git grep "const struct pci_device_id" | wc -l
> > 1254
>
> did you check for non-const ones? just to see if we have any of the
> broken case in the tree :-)
I didn't :)
> as for consistency, pci_dev vs usb_device :-P
Read farther down the email...
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 16:43 ` Greg KH
2014-07-18 16:54 ` James Bottomley
@ 2014-07-18 18:05 ` Joe Perches
1 sibling, 0 replies; 33+ messages in thread
From: Joe Perches @ 2014-07-18 18:05 UTC (permalink / raw)
To: Greg KH
Cc: John W. Linville, Benoit Taine, linux-mips, linux-fbdev,
linux-pci, dri-devel, linux-kernel, ath5k-devel, linux-acenic,
linux-scsi, linux-rdma, ath10k, linux-hippi, industrypack-devel,
linux-mmc, MPT-FusionLinux.pdl, virtualization, ath9k-devel,
wil6210, linux-pcmcia, linux-can, xen-devel, platform-driver-x86,
netdev, linux-wireless, users, e1000-devel, linux-crypto, deve
On Fri, 2014-07-18 at 09:43 -0700, Greg KH wrote:
> On Fri, Jul 18, 2014 at 12:22:13PM -0400, John W. Linville wrote:
> > On Fri, Jul 18, 2014 at 05:26:47PM +0200, Benoit Taine wrote:
> > > We should prefer `const struct pci_device_id` over
> > > `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines.
> > > This issue was reported by checkpatch.
> > scripts/checkpatch.pl | 4 ++--
> > Honestly, I prefer the macro -- it stands-out more. Maybe the style
> > guidelines and/or checkpatch should change instead?
>
> The macro is horrid, no other bus has this type of thing just to save a
> few characters in typing, so why should PCI be "special" in this regard
> anymore?
I think it doesn't matter much.
The PCI_DEVICE and PCI_VDEVICE macro uses are somewhat similar
and are frequently used with PCI_DEVICE_TABLE, so there's some
commonality there.
The checkpatch message could be made --strict/CHK instead of
WARN so most people would never see it.
Of course it could be removed altogether too. I don't care.
---
(suggested patch is for -next)
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index dc72a9b..754fbf2 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3018,8 +3018,8 @@ sub process {
# check for uses of DEFINE_PCI_DEVICE_TABLE
if ($line =~ /\bDEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=/) {
- if (WARN("DEFINE_PCI_DEVICE_TABLE",
- "Prefer struct pci_device_id over deprecated DEFINE_PCI_DEVICE_TABLE\n" . $herecurr) &&
+ if (CHK("DEFINE_PCI_DEVICE_TABLE",
+ "Prefer struct pci_device_id over deprecated DEFINE_PCI_DEVICE_TABLE\n" . $herecurr) &&
$fix) {
$fixed[$fixlinenr] =~ s/\b(?:static\s+|)DEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=\s*/static const struct pci_device_id $1\[\] = /;
}
^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (19 preceding siblings ...)
2014-07-18 16:22 ` [PATCH 0/25] " John W. Linville
@ 2014-07-18 16:28 ` James Bottomley
2014-07-18 16:33 ` Keller, Jacob E
2014-07-21 4:18 ` David Miller
21 siblings, 1 reply; 33+ messages in thread
From: James Bottomley @ 2014-07-18 16:28 UTC (permalink / raw)
To: Benoit Taine
Cc: linux-mips, linux-fbdev, linux-pci, dri-devel, linux-kernel,
ath5k-devel, linux-acenic, linux-scsi, linux-rdma, ath10k,
linux-hippi, industrypack-devel, linux-mmc, MPT-FusionLinux.pdl,
virtualization, ath9k-devel, wil6210, linux-pcmcia, linux-can,
xen-devel, platform-driver-x86, netdev, linux-wireless, users,
e1000-devel, linux-crypto, devel
On Fri, 2014-07-18 at 17:26 +0200, Benoit Taine wrote:
> We should prefer `const struct pci_device_id` over
> `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines.
> This issue was reported by checkpatch.
What kernel coding style? checkpatch isn't the arbiter of style, if
that's the only problem.
The DEFINE_PCI macro was a well reasoned addition when it was added in
2008. The problem was most people were getting the definition wrong.
When we converted away from CONFIG_HOTPLUG, having this DEFINE_ meant
that only one place needed changing instead of hundreds for PCI tables.
The reason people were getting the PCI table wrong was mostly the init
section specifiers which are now gone, but it has enough underlying
utility (mostly constification) that I don't think we'd want to churn
the kernel hugely to make a change to struct pci_table and then have to
start detecting and fixing misuses.
James
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 16:28 ` James Bottomley
@ 2014-07-18 16:33 ` Keller, Jacob E
0 siblings, 0 replies; 33+ messages in thread
From: Keller, Jacob E @ 2014-07-18 16:33 UTC (permalink / raw)
To: James.Bottomley@HansenPartnership.com
Cc: linux-mips@linux-mips.org, linux-fbdev@vger.kernel.org,
linux-pci@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, benoit.taine@lip6.fr,
ath5k-devel@venema.h4ckr.net, linux-acenic@sunsite.dk,
linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org,
ath10k@lists.infradead.org, linux-hippi@sunsite.dk,
industrypack-devel@lists.sourceforge.net,
linux-wireless@vger.kernel.org, "xen-devel@lists.xenproject.o
On Fri, 2014-07-18 at 09:28 -0700, James Bottomley wrote:
> On Fri, 2014-07-18 at 17:26 +0200, Benoit Taine wrote:
> > We should prefer `const struct pci_device_id` over
> > `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines.
> > This issue was reported by checkpatch.
>
> What kernel coding style? checkpatch isn't the arbiter of style, if
> that's the only problem.
>
> The DEFINE_PCI macro was a well reasoned addition when it was added in
> 2008. The problem was most people were getting the definition wrong.
> When we converted away from CONFIG_HOTPLUG, having this DEFINE_ meant
> that only one place needed changing instead of hundreds for PCI tables.
>
> The reason people were getting the PCI table wrong was mostly the init
> section specifiers which are now gone, but it has enough underlying
> utility (mostly constification) that I don't think we'd want to churn
> the kernel hugely to make a change to struct pci_table and then have to
> start detecting and fixing misuses.
>
> James
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
I would rather fix the misuses of the macro, than remove it. Could we
possibly make checkpatch smart enough to tell when the macro is misused?
Thanks,
Jake
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use
2014-07-18 15:26 [PATCH 0/25] Replace DEFINE_PCI_DEVICE_TABLE macro use Benoit Taine
` (20 preceding siblings ...)
2014-07-18 16:28 ` James Bottomley
@ 2014-07-21 4:18 ` David Miller
21 siblings, 0 replies; 33+ messages in thread
From: David Miller @ 2014-07-21 4:18 UTC (permalink / raw)
To: benoit.taine
Cc: linux-pci, ath5k-devel, ath9k-devel, linux-hippi, dri-devel,
linux-acenic, wil6210, platform-driver-x86, linux-scsi,
linux-kernel, netdev, linux-wireless, linux-mips, users,
linux-rdma, virtualization, industrypack-devel, linux-can,
linux-mmc, linux-fbdev, ath10k, linux-crypto, MPT-FusionLinux.pdl,
devel, xen-devel, linux-pcmcia, e1000-devel
From: Benoit Taine <benoit.taine@lip6.fr>
Date: Fri, 18 Jul 2014 17:26:47 +0200
> We should prefer `const struct pci_device_id` over
> `DEFINE_PCI_DEVICE_TABLE` to meet kernel coding style guidelines.
> This issue was reported by checkpatch.
>
> A simplified version of the semantic patch that makes this change is as
> follows (http://coccinelle.lip6.fr/):
>
> // <smpl>
>
> @@
> identifier i;
> declarer name DEFINE_PCI_DEVICE_TABLE;
> initializer z;
> @@
>
> - DEFINE_PCI_DEVICE_TABLE(i)
> + const struct pci_device_id i[]
> = z;
>
> // </smpl>
>
> I have 103 patches ready, and will only send a few for you to judge if
> it is useful enough, and to prevent from spamming too much.
I'm fine with this wrt. the networking changes, but I don't think this should
be merged via my tree.
^ permalink raw reply [flat|nested] 33+ messages in thread