Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13ac58da authored by Németh Márton's avatar Németh Márton Committed by Greg Kroah-Hartman
Browse files

staging: make PCI device id constant 

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: default avatarNémeth Márton <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 75b16013

drivers/staging/phison/phison.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static int phison_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -2587,7 +2587,7 @@ static int __devinit sep_probe(struct pci_dev *pdev, const struct pci_device_id 
	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
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ static int __init smtcfb_pci_probe(struct pci_dev *pdev, 




/* 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
Original line number Diff line number Diff line
@@ -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) },

	{ },

};