Commit 1192aeb9 authored by Julia Lawall's avatar Julia Lawall Committed by Len Brown
Browse files

ACPI: drivers/acpi: elide a non-zero test on a result that is never 0 

The function thermal_cooling_device_register always returns either a valid
pointer or a value made with ERR_PTR, so a test for non-zero on the result
will always succeed.

The problem was found using the following semantic match.
(http://www.emn.fr/x-info/coccinelle/

)

//<smpl>
@a@
expression E, E1;
statement S,S1;
position p;
@@

E = thermal_cooling_device_register(...)
... when != E = E1
if@p (E) S else S1

@n@
position a.p;
expression E,E1;
statement S,S1;
@@

E = NULL
... when != E = E1
if@p (E) S else S1

@depends on !n@
expression E;
statement S,S1;
position a.p;
@@

* if@p (E)
  S else S1
//</smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 86d9fc12

drivers/acpi/fan.c

+16 −18
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ static int acpi_fan_add(struct acpi_device *device) 
		result = PTR_ERR(cdev);

		goto end;

	}

	if (cdev) {

	printk(KERN_INFO PREFIX

		"%s is registered as cooling_device%d\n",

		device->dev.bus_id, cdev->id);
@@ -277,7 +276,6 @@ static int acpi_fan_add(struct acpi_device *device) 
				   "device");

	if (result)

		return result;

	}



	result = acpi_fan_add_fs(device);

	if (result)

drivers/acpi/processor_core.c

+14 −16
Original line number Diff line number Diff line
@@ -674,7 +674,6 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device) 
		result = PTR_ERR(pr->cdev);

		goto end;

	}

	if (pr->cdev) {

	printk(KERN_INFO PREFIX

		"%s is registered as cooling_device%d\n",

		device->dev.bus_id, pr->cdev->id);
@@ -689,7 +688,6 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device) 
				   "device");

	if (result)

		return result;

	}



	if (pr->flags.throttling) {

		printk(KERN_INFO PREFIX "%s [%s] (supports",

drivers/acpi/video.c

+13 −15
Original line number Diff line number Diff line
@@ -734,7 +734,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) 
		if (IS_ERR(device->cdev))

			return;



		if (device->cdev) {

		printk(KERN_INFO PREFIX

			"%s is registered as cooling_device%d\n",

			device->dev->dev.bus_id, device->cdev->id);
@@ -749,7 +748,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) 
		if (result)

			printk(KERN_ERR PREFIX "Create sysfs link\n");

	}

	}

	if (device->cap._DCS && device->cap._DSS){

		static int count = 0;

		char *name;

CRA Git | Maintained and supported by SUSTech CRA and CCSE