Commit 3a8ca95e authored Apr 29, 2008 by Julia Lawall Committed by Linus Torvalds Apr 29, 2008

drivers/misc: 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: Julia Lawall <julia@diku.dk>
Cc: Thomas Sujith <sujith.thomas@intel.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 95d8c365

drivers/misc/intel_menlow.c

+11 −13

Original line number	Diff line number	Diff line
		@@ -175,7 +175,6 @@ static int intel_menlow_memory_add(struct acpi_device *device)
		goto end;
		}

		if (cdev) {
		acpi_driver_data(device) = cdev;
		result = sysfs_create_link(&device->dev.kobj,
		&cdev->device.kobj, "thermal_cooling");
		@@ -188,7 +187,6 @@ static int intel_menlow_memory_add(struct acpi_device *device)
		sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
		goto unregister;
		}
		}

		end:
		return result;