提交 3a8ca95e 编写于 作者: J Julia Lawall 提交者: Linus Torvalds

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: NJulia 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: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 95d8c365
...@@ -175,19 +175,17 @@ static int intel_menlow_memory_add(struct acpi_device *device) ...@@ -175,19 +175,17 @@ static int intel_menlow_memory_add(struct acpi_device *device)
goto end; goto end;
} }
if (cdev) { acpi_driver_data(device) = cdev;
acpi_driver_data(device) = cdev; result = sysfs_create_link(&device->dev.kobj,
result = sysfs_create_link(&device->dev.kobj, &cdev->device.kobj, "thermal_cooling");
&cdev->device.kobj, "thermal_cooling"); if (result)
if (result) goto unregister;
goto unregister;
result = sysfs_create_link(&cdev->device.kobj,
result = sysfs_create_link(&cdev->device.kobj, &device->dev.kobj, "device");
&device->dev.kobj, "device"); if (result) {
if (result) { sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
sysfs_remove_link(&device->dev.kobj, "thermal_cooling"); goto unregister;
goto unregister;
}
} }
end: end:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册