Skip to contentSkip to conversation

staging: make PCI device id constant

PATCH Applied Németh Márton 3 participants 4 messages Jan 9, 2010 – Jan 15, 2010 Staging

lore
Share & tools
lore

Németh Márton

author
#0 lore raw

PATCH 1/3 staging: 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 the 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>

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

---

drivers/staging/sm7xx/smtcfb.c 2010-01-08 09:56:41.000000000 +0100 renamed from drivers/staging/sm7xx/smtcfb.c 2010-01-07 19:08:46.000000000 +0100 +1 -1
diff -u -p a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xx/smtcfb.c
@@ -1103,7 +1103,7 @@ static int __init smtcfb_pci_probe(struc
 
 
 /* Jason (08/11/2009) PCI_DRV wrapper essential structs */
-static struct pci_device_id smtcfb_pci_table[] = {
+static const struct pci_device_id smtcfb_pci_table[] = {
 	{0x126f, 0x710, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0x126f, 0x712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0x126f, 0x720, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
drivers/staging/sep/sep_driver.c 2010-01-08 09:57:33.000000000 +0100 renamed from drivers/staging/sep/sep_driver.c 2010-01-07 19:08:46.000000000 +0100 +1 -1
diff -u -p a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
@@ -2586,7 +2586,7 @@ end_function:
 	return error;
 }
 
-static struct pci_device_id sep_pci_id_tbl[] = {
+static const struct pci_device_id sep_pci_id_tbl[] = {
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080c)},
 	{0}
 };
drivers/staging/vme/bridges/vme_tsi148.c 2010-01-08 10:26:28.000000000 +0100 renamed from drivers/staging/vme/bridges/vme_tsi148.c 2010-01-07 19:08:46.000000000 +0100 +1 -1
diff -u -p a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c
@@ -80,7 +80,7 @@ struct mutex vme_int;	/*
 
 static char driver_name[] = "vme_tsi148";
 
-static struct pci_device_id tsi148_ids[] = {
+static const struct pci_device_id tsi148_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_TUNDRA, PCI_DEVICE_ID_TUNDRA_TSI148) },
 	{ },
 };
drivers/staging/vme/bridges/vme_ca91cx42.c 2010-01-08 10:26:58.000000000 +0100 renamed from drivers/staging/vme/bridges/vme_ca91cx42.c 2010-01-07 19:08:46.000000000 +0100 +1 -1
diff -u -p a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -56,7 +56,7 @@ struct mutex vme_int;   /*
 
 static char driver_name[] = "vme_ca91cx42";
 
-static struct pci_device_id ca91cx42_ids[] = {
+static const struct pci_device_id ca91cx42_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_TUNDRA, PCI_DEVICE_ID_TUNDRA_CA91C142) },
 	{ },
 };
drivers/staging/phison/phison.c 2010-01-08 10:27:46.000000000 +0100 renamed from drivers/staging/phison/phison.c 2010-01-07 19:08:45.000000000 +0100 +1 -1
diff -u -p a/drivers/staging/phison/phison.c b/drivers/staging/phison/phison.c
@@ -69,7 +69,7 @@ static int phison_init_one(struct pci_de
 	return ret;
 }
 
-static struct pci_device_id phison_pci_tbl[] = {
+static const struct pci_device_id phison_pci_tbl[] = {
 	{ PCI_VENDOR_ID_PHISON, PCI_DEVICE_ID_PS5000, PCI_ANY_ID, PCI_ANY_ID,
 	  PCI_CLASS_STORAGE_IDE << 8, 0xffff00, 0 },
 	{ 0, },
drivers/staging/rar/rar_driver.c 2010-01-08 11:11:53.000000000 +0100 renamed from drivers/staging/rar/rar_driver.c 2010-01-07 19:08:45.000000000 +0100 +1 -1
diff -u -p a/drivers/staging/rar/rar_driver.c b/drivers/staging/rar/rar_driver.c
@@ -70,7 +70,7 @@ static void __exit rar_exit_handler(void
 */
 static int __devinit rar_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 
-static struct pci_device_id rar_pci_id_tbl[] = {
+static const struct pci_device_id rar_pci_id_tbl[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4110) },
 	{ 0 }
 };
#1 lore raw
Quoted 5 lines · On Sun, 10 Jan 2010 00:18:26 +0100 Németh Márton <[email protected]> wrote:

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 the initialization data also constant.

the PCI ID table can get written too via sysfs... making it const breaks that...

Signature · 3 lines
Arjan van de Ven 	Intel Open Source Technology Centre
For development, discussion and tips for power savings, 
visit http://www.lesswatts.org
#2 lore raw
Quoted 5 lines · Arjan van de Ven
Quoted 2 lines · On Sun, 10 Jan 2010 00:18:26 +0100 Németh Márton <[email protected]> wrote:

From: Márton Németh <[email protected]>

Quoted 7 lines
Quoted 3 lines

The id_table field of the struct pci_driver is constant in <linux/pci.h> so it is worth to make the initialization data also constant.

the PCI ID table can get written too via sysfs... making it const breaks that...

It shouldn't, I thought that was what we used the dynids field in the pci_driver structure :)

thanks,

greg k-h

Applied
#3 lore raw

patch staging-make-pci-device-id-constant.patch added to gregkh-2.6 tree

In reply to Németh Márton

This is a note to let you know that I've just added the patch titled

Subject: staging: make PCI device id constant

to my gregkh-2.6 tree. Its filename is

staging-make-pci-device-id-constant.patch

This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

Quoted 1 line

From [email protected] Thu Jan 14 17:08:52 2010

From: Németh Márton <[email protected]>
Date: Sun, 10 Jan 2010 00:18:26 +0100
Subject: staging: make PCI device id constant
To: Greg Kroah-Hartman <[email protected]>
Cc: [email protected], Julia Lawall <[email protected]>, LKML <[email protected]>, [email protected]
Message-ID: <[email protected]>

From: Németh Márton <[email protected]>

The id_table field of the struct pci_driver is constant in <linux/pci.h> so it is worth to make the 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>

Signed-off-by Németh Márton <[email protected]>
Cc Julia Lawall <[email protected]>
Cc [email protected]
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/phison/phison.c            |    2 +-
 drivers/staging/rar/rar_driver.c           |    2 +-
 drivers/staging/sep/sep_driver.c           |    2 +-
 drivers/staging/sm7xx/smtcfb.c             |    2 +-
 drivers/staging/vme/bridges/vme_ca91cx42.c |    2 +-
 drivers/staging/vme/bridges/vme_tsi148.c   |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/phison/phison.c +1 -1
@@ -69,7 +69,7 @@ static int phison_init_one(struct pci_de
 	return ret;
 }
 
-static struct pci_device_id phison_pci_tbl[] = {
+static const struct pci_device_id phison_pci_tbl[] = {
 	{ PCI_VENDOR_ID_PHISON, PCI_DEVICE_ID_PS5000, PCI_ANY_ID, PCI_ANY_ID,
 	  PCI_CLASS_STORAGE_IDE << 8, 0xffff00, 0 },
 	{ 0, },
drivers/staging/rar/rar_driver.c +1 -1
@@ -71,7 +71,7 @@ static void __exit rar_exit_handler(void
 static int __devinit rar_probe(struct pci_dev *pdev,
 			       const struct pci_device_id *ent);
 
-static struct pci_device_id rar_pci_id_tbl[] = {
+static const struct pci_device_id rar_pci_id_tbl[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4110) },
 	{ 0 }
 };
drivers/staging/sep/sep_driver.c +1 -1
@@ -2587,7 +2587,7 @@ end_function:
 	return error;
 }
 
-static struct pci_device_id sep_pci_id_tbl[] = {
+static const struct pci_device_id sep_pci_id_tbl[] = {
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080c)},
 	{0}
 };
drivers/staging/sm7xx/smtcfb.c +1 -1
@@ -1103,7 +1103,7 @@ static int __init smtcfb_pci_probe(struc
 
 
 /* Jason (08/11/2009) PCI_DRV wrapper essential structs */
-static struct pci_device_id smtcfb_pci_table[] = {
+static const struct pci_device_id smtcfb_pci_table[] = {
 	{0x126f, 0x710, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0x126f, 0x712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{0x126f, 0x720, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
drivers/staging/vme/bridges/vme_ca91cx42.c +1 -1
@@ -61,7 +61,7 @@ static struct mutex vme_int;	/*
 
 static char driver_name[] = "vme_ca91cx42";
 
-static struct pci_device_id ca91cx42_ids[] = {
+static const struct pci_device_id ca91cx42_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_TUNDRA, PCI_DEVICE_ID_TUNDRA_CA91C142) },
 	{ },
 };
drivers/staging/vme/bridges/vme_tsi148.c +1 -1
@@ -81,7 +81,7 @@ static struct mutex vme_int;	/*
 
 static char driver_name[] = "vme_tsi148";
 
-static struct pci_device_id tsi148_ids[] = {
+static const struct pci_device_id tsi148_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_TUNDRA, PCI_DEVICE_ID_TUNDRA_TSI148) },
 	{ },
 };