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

Commit 3d447ec0 authored by Márton Németh's avatar Márton Németh Committed by Jens Axboe
Browse files

block: 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 avatarMárton Németh <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent e03a72e1

drivers/block/DAC960.c

+1 −1
Original line number Diff line number Diff line
@@ -7134,7 +7134,7 @@ static struct DAC960_privdata DAC960_P_privdata = { 
	.MemoryWindowSize =	DAC960_PD_RegisterWindowSize,

};



static struct pci_device_id DAC960_id_table[] = {

static const struct pci_device_id DAC960_id_table[] = {

	{

		.vendor 	= PCI_VENDOR_ID_MYLEX,

		.device		= PCI_DEVICE_ID_MYLEX_DAC960_GEM,

drivers/block/sx8.c

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
static void carm_remove_one (struct pci_dev *pdev);

static int carm_bdev_getgeo(struct block_device *bdev, struct hd_geometry *geo);



static struct pci_device_id carm_pci_tbl[] = {

static const struct pci_device_id carm_pci_tbl[] = {

	{ PCI_VENDOR_ID_PROMISE, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },

	{ PCI_VENDOR_ID_PROMISE, 0x8002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },

	{ }	/* terminate list */