renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
Code

staging: make PCI device id constant

Browse Source 
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 <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Németh Márton 2010-01-10 00:18:26 +01:00 committed by Greg Kroah-Hartman
parent 75b16013e2
commit 13ac58dac0
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/phison/phison.c
View File

@ -69,7 +69,7 @@ static int phison_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return ret; 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_VENDOR_ID_PHISON, PCI_DEVICE_ID_PS5000, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_IDE << 8, 0xffff00, 0 }, PCI_CLASS_STORAGE_IDE << 8, 0xffff00, 0 },
{ 0, }, { 0, },

2
drivers/staging/rar/rar_driver.c
View File

@ -71,7 +71,7 @@ static void __exit rar_exit_handler(void);
static int __devinit rar_probe(struct pci_dev *pdev, static int __devinit rar_probe(struct pci_dev *pdev,
const struct pci_device_id *ent); 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) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4110) },
{ 0 } { 0 }
}; };

2
drivers/staging/sep/sep_driver.c
View File

@ -2587,7 +2587,7 @@ end_function:
return error; 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)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080c)},
{0} {0}
}; };

2
drivers/staging/sm7xx/smtcfb.c
View File

@ -1103,7 +1103,7 @@ static int __init smtcfb_pci_probe(struct pci_dev *pdev,
/* Jason (08/11/2009) PCI_DRV wrapper essential structs */ /* 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, 0x710, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0x126f, 0x712, 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}, {0x126f, 0x720, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},

2
drivers/staging/vme/bridges/vme_ca91cx42.c
View File

@ -61,7 +61,7 @@ static struct mutex vme_int; /*
static char driver_name[] = "vme_ca91cx42"; 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) }, { PCI_DEVICE(PCI_VENDOR_ID_TUNDRA, PCI_DEVICE_ID_TUNDRA_CA91C142) },
{ }, { },
}; };

2
drivers/staging/vme/bridges/vme_tsi148.c
View File

@ -81,7 +81,7 @@ static struct mutex vme_int; /*
static char driver_name[] = "vme_tsi148"; 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) }, { PCI_DEVICE(PCI_VENDOR_ID_TUNDRA, PCI_DEVICE_ID_TUNDRA_TSI148) },
{ }, { },
}; };