Skip to contentSkip to conversation

acpi: make ACPI device id constant

PATCH Applied Németh Márton 2 participants 2 messages Jan 10, 2010 – Jan 16, 2010

Subsystems (2)
ACPI PCI
lore
Share & tools
lore

Németh Márton

author
#0 lore raw

PATCH 1/1 acpi: make ACPI device id constant

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

The ids field of the struct acpi_driver is constant in <linux/acpi/acpi_bus.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/acpi/power.c 2010-01-08 15:02:32.000000000 +0100 renamed from drivers/acpi/power.c 2009-12-03 04:51:21.000000000 +0100 +1 -1
diff -u -p a/drivers/acpi/power.c b/drivers/acpi/power.c
@@ -65,7 +65,7 @@ static int acpi_power_remove(struct acpi
 static int acpi_power_resume(struct acpi_device *device);
 static int acpi_power_open_fs(struct inode *inode, struct file *file);
 
-static struct acpi_device_id power_device_ids[] = {
+static const struct acpi_device_id power_device_ids[] = {
 	{ACPI_POWER_HID, 0},
 	{"", 0},
 };
drivers/acpi/power_meter.c 2010-01-08 15:03:09.000000000 +0100 renamed from drivers/acpi/power_meter.c 2009-12-03 04:51:21.000000000 +0100 +1 -1
diff -u -p a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
@@ -64,7 +64,7 @@ static int can_cap_in_hardware(void)
 	return force_cap_on || cap_in_hardware;
 }
 
-static struct acpi_device_id power_meter_ids[] = {
+static const struct acpi_device_id power_meter_ids[] = {
 	{"ACPI000D", 0},
 	{"", 0},
 };
drivers/acpi/pci_link.c 2010-01-08 15:03:22.000000000 +0100 renamed from drivers/acpi/pci_link.c 2009-12-03 04:51:21.000000000 +0100 +1 -1
diff -u -p a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
@@ -56,7 +56,7 @@ ACPI_MODULE_NAME("pci_link");
 static int acpi_pci_link_add(struct acpi_device *device);
 static int acpi_pci_link_remove(struct acpi_device *device, int type);
 
-static struct acpi_device_id link_device_ids[] = {
+static const struct acpi_device_id link_device_ids[] = {
 	{"PNP0C0F", 0},
 	{"", 0},
 };
drivers/acpi/pci_root.c 2010-01-08 15:06:03.000000000 +0100 renamed from drivers/acpi/pci_root.c 2010-01-07 19:08:39.000000000 +0100 +1 -1
diff -u -p a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
@@ -46,7 +46,7 @@ static int acpi_pci_root_add(struct acpi
 static int acpi_pci_root_remove(struct acpi_device *device, int type);
 static int acpi_pci_root_start(struct acpi_device *device);
 
-static struct acpi_device_id root_device_ids[] = {
+static const struct acpi_device_id root_device_ids[] = {
 	{"PNP0A03", 0},
 	{"", 0},
 };

_______________________________________________
Cocci mailing list
[email protected]
http://lists.diku.dk/mailman/listinfo/cocci
(Web access from inside DIKUs LAN only)

reviewer Applied
#1 lore raw

applied

thanks,
Len Brown, Intel Open Source Technology Center