serial: make PCI device id constant
PATCH 3/3 serial: make PCI device id constant
From: Márton Németh <[email protected]>
The id_table field of the struct pci_driver is constant in <linux/pci.h> so it is worth to make initialization data also constant.
The semantic match that finds this kind of pattern is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r@
disable decl_init,const_decl_init;
identifier I1, I2, x;
@@
struct I1 {
...
const struct I2 *x;
...
};@s@
identifier r.I1, y;
identifier r.x, E;
@@
struct I1 y = {
.x = E,
};@c@
identifier r.I2;
identifier s.E;
@@
const struct I2 E[] = ... ;
@depends on !c@
identifier r.I2;
identifier s.E;
@@
+ const
struct I2 E[] = ...;
// </smpl>
---
drivers/serial/8250_pci.c 2010-01-08 18:40:05.000000000 +0100 renamed from drivers/serial/8250_pci.c 2009-12-03 04:51:21.000000000 +0100 +1 -1
@@ -2567,7 +2567,7 @@ static int pciserial_resume_one(struct p } #endif -static struct pci_device_id serial_pci_tbl[] = { +static const struct pci_device_id serial_pci_tbl[] = { /* Advantech use PCI_DEVICE_ID_ADVANTECH_PCI3620 (0x3620) as 'PCI_SUBVENDOR_ID' */ { PCI_VENDOR_ID_ADVANTECH, PCI_DEVICE_ID_ADVANTECH_PCI3620, PCI_DEVICE_ID_ADVANTECH_PCI3620, 0x0001, 0, 0,
drivers/serial/jsm/jsm_driver.c 2010-01-08 18:41:09.000000000 +0100 renamed from drivers/serial/jsm/jsm_driver.c 2010-01-07 19:08:45.000000000 +0100 +1 -1
@@ -218,7 +218,7 @@ static void __devexit jsm_remove_one(str kfree(brd); } -static struct pci_device_id jsm_pci_tbl[] = { +static const struct pci_device_id jsm_pci_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2DB9), 0, 0, 0 }, { PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2DB9PRI), 0, 0, 1 }, { PCI_DEVICE(PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_NEO_2RJ45), 0, 0, 2 },
_______________________________________________
Cocci mailing list
[email protected]
http://lists.diku.dk/mailman/listinfo/cocci
(Web access from inside DIKUs LAN only)
2010/1/10 Németh Márton <[email protected]>:
Quoted 4 lines
From: Márton Németh <[email protected]>
The
id_tablefield of the structpci_driveris constant in <linux/pci.h> so it is worth to make initialization data also constant.
[...]
drivers/serial/8250_pci.c 2010-01-08 18:40:05.000000000 +0100 static int pciserial_resume_one(struct p · line 2573
Quoted 12 lines
diff -u -p
a/drivers/serial/8250_pci.cb/drivers/serial/8250_pci.cdrivers/serial/8250_pci.c 2010-01-08 18:40:05.000000000 +0100 renamed from drivers/serial/8250_pci.c 2009-12-03 04:51:21.000000000 +0100 +1
-1@@ -2567,7 +2567,7 @@ static int pciserial_resume_one(struct p } #endif -static struct pci_device_id serial_pci_tbl[] = { +static const struct pci_device_id serial_pci_tbl[] = { /* Advantech use PCI_DEVICE_ID_ADVANTECH_PCI3620 (0x3620) as 'PCI_SUBVENDOR_ID' */ { PCI_VENDOR_ID_ADVANTECH, PCI_DEVICE_ID_ADVANTECH_PCI3620, PCI_DEVICE_ID_ADVANTECH_PCI3620, 0x0001, 0, 0,
[...]
There was similar patch sent to netdev couple days ago. For PCI devices it used DEFINE_PCI_DEVICE_TABLE() like this:
static DEFINE_PCI_DEVICE_TABLE(serial_pci_tbl) = {
so that the ID data went to the proper .ko section.
Best Regards,
Michał Mirosław
Quoted 20 lines · Michał Mirosław
2010/1/10 Németh Márton <[email protected]>:
Quoted 4 lines
From: Márton Németh <[email protected]>
The
id_tablefield of the structpci_driveris constant in <linux/pci.h> so it is worth to make initialization data also constant.[...]
Quoted 12 lines
diff -u -p
a/drivers/serial/8250_pci.cb/drivers/serial/8250_pci.cdrivers/serial/8250_pci.c 2010-01-08 18:40:05.000000000 +0100 renamed from drivers/serial/8250_pci.c 2009-12-03 04:51:21.000000000 +0100 +1
-1@@ -2567,7 +2567,7 @@ static int pciserial_resume_one(struct p } #endif -static struct pci_device_id serial_pci_tbl[] = { +static const struct pci_device_id serial_pci_tbl[] = { /* Advantech use PCI_DEVICE_ID_ADVANTECH_PCI3620 (0x3620) as 'PCI_SUBVENDOR_ID' */ { PCI_VENDOR_ID_ADVANTECH, PCI_DEVICE_ID_ADVANTECH_PCI3620, PCI_DEVICE_ID_ADVANTECH_PCI3620, 0x0001, 0, 0,[...]
Quoted 6 lines
There was similar patch sent to netdev couple days ago. For PCI devices it used
DEFINE_PCI_DEVICE_TABLE()like this:static
DEFINE_PCI_DEVICE_TABLE(serial_pci_tbl)= {so that the ID data went to the proper .ko section.
Thanks for the feedback. The DEFINE_PCI_DEVICE_TABLE() is also recommended by Documentation/PCI/pci.txt .
Regads,
Márton Németh
_______________________________________________
Cocci mailing list
[email protected]
http://lists.diku.dk/mailman/listinfo/cocci
(Web access from inside DIKUs LAN only)