Skip to contentSkip to conversation

8139too: make PCI device ids constant

PATCH Applied Németh Márton 2 participants 2 messages Jan 4, 2010 – Jan 7, 2010

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Németh Márton

author
#0 lore raw

PATCH 1/1 8139too: make PCI device ids 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 pci_device_id also constant.

The semantic match that finds this kind of pattern is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r@
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>

Signed-off-by Márton Németh <[email protected]>
Cc Julia Lawall <[email protected]>
Cc [email protected]

---

drivers/net/pci-skeleton.c 2010-01-03 21:08:03.000000000 +0100 renamed from drivers/net/pci-skeleton.c 2009-12-27 12:20:35.000000000 +0100 +1 -1
diff -u -p a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
@@ -211,7 +211,7 @@ static struct {
 };
 
 
-static struct pci_device_id netdrv_pci_tbl[] = {
+static const struct pci_device_id netdrv_pci_tbl[] = {
 	{0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
 	{0x10ec, 0x8138, PCI_ANY_ID, PCI_ANY_ID, 0, 0, NETDRV_CB },
 	{0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SMC1211TX },
drivers/net/8139too.c 2010-01-03 21:25:05.000000000 +0100 renamed from drivers/net/8139too.c 2009-12-27 12:20:30.000000000 +0100 +1 -1
diff -u -p a/drivers/net/8139too.c b/drivers/net/8139too.c
@@ -231,7 +231,7 @@ static const struct {
 };
 
 
-static struct pci_device_id 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 },
maintainer Applied
#1 lore raw

From: Németh Márton <[email protected]>
Date: Tue, 05 Jan 2010 00:03:02 +0100

Quoted 4 lines

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 pci_device_id also constant.

Applied to net-next-2.6, thank you.