* [PATCH 4/5] drivers/acpi: elide a non-zero test on a result that is never 0
@ 2008-03-24 18:10 Julia Lawall
2008-03-25 7:50 ` Zhang, Rui
2008-03-25 8:31 ` Zhang, Rui
0 siblings, 2 replies; 7+ messages in thread
From: Julia Lawall @ 2008-03-24 18:10 UTC (permalink / raw)
To: len.brown, rui.zhang, linux-acpi, linux-kernel, kernel-janitors
From: Julia Lawall <julia@diku.dk>
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>
---
drivers/acpi/fan.c | 34 ++++++++++++++++------------------
drivers/acpi/processor_core.c | 30 ++++++++++++++----------------
drivers/acpi/video.c | 28 +++++++++++++---------------
3 files changed, 43 insertions(+), 49 deletions(-)
diff -u -p a/drivers/acpi/fan.c b/drivers/acpi/fan.c
--- a/drivers/acpi/fan.c 2008-03-12 14:13:13.000000000 +0100
+++ b/drivers/acpi/fan.c 2008-03-24 16:14:50.000000000 +0100
@@ -260,24 +260,22 @@ static int acpi_fan_add(struct acpi_devi
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);
-
- acpi_driver_data(device) = cdev;
- result = sysfs_create_link(&device->dev.kobj,
- &cdev->device.kobj,
- "thermal_cooling");
- if (result)
- return result;
-
- result = sysfs_create_link(&cdev->device.kobj,
- &device->dev.kobj,
- "device");
- if (result)
- return result;
- }
+ printk(KERN_INFO PREFIX
+ "%s is registered as cooling_device%d\n",
+ device->dev.bus_id, cdev->id);
+
+ acpi_driver_data(device) = cdev;
+ result = sysfs_create_link(&device->dev.kobj,
+ &cdev->device.kobj,
+ "thermal_cooling");
+ if (result)
+ return result;
+
+ result = sysfs_create_link(&cdev->device.kobj,
+ &device->dev.kobj,
+ "device");
+ if (result)
+ return result;
result = acpi_fan_add_fs(device);
if (result)
diff -u -p a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
--- a/drivers/acpi/processor_core.c 2008-03-12 14:13:13.000000000 +0100
+++ b/drivers/acpi/processor_core.c 2008-03-24 16:15:53.000000000 +0100
@@ -674,22 +674,20 @@ static int __cpuinit acpi_processor_star
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);
-
- result = sysfs_create_link(&device->dev.kobj,
- &pr->cdev->device.kobj,
- "thermal_cooling");
- if (result)
- return result;
- result = sysfs_create_link(&pr->cdev->device.kobj,
- &device->dev.kobj,
- "device");
- if (result)
- return result;
- }
+ printk(KERN_INFO PREFIX
+ "%s is registered as cooling_device%d\n",
+ device->dev.bus_id, pr->cdev->id);
+
+ result = sysfs_create_link(&device->dev.kobj,
+ &pr->cdev->device.kobj,
+ "thermal_cooling");
+ if (result)
+ return result;
+ result = sysfs_create_link(&pr->cdev->device.kobj,
+ &device->dev.kobj,
+ "device");
+ if (result)
+ return result;
if (pr->flags.throttling) {
printk(KERN_INFO PREFIX "%s [%s] (supports",
diff -u -p a/drivers/acpi/video.c b/drivers/acpi/video.c
--- a/drivers/acpi/video.c 2008-03-12 14:13:13.000000000 +0100
+++ b/drivers/acpi/video.c 2008-03-24 16:17:17.000000000 +0100
@@ -734,21 +734,19 @@ static void acpi_video_device_find_cap(s
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);
- result = sysfs_create_link(&device->dev->dev.kobj,
- &device->cdev->device.kobj,
- "thermal_cooling");
- if (result)
- printk(KERN_ERR PREFIX "Create sysfs link\n");
- result = sysfs_create_link(&device->cdev->device.kobj,
- &device->dev->dev.kobj,
- "device");
- if (result)
- printk(KERN_ERR PREFIX "Create sysfs link\n");
- }
+ printk(KERN_INFO PREFIX
+ "%s is registered as cooling_device%d\n",
+ device->dev->dev.bus_id, device->cdev->id);
+ result = sysfs_create_link(&device->dev->dev.kobj,
+ &device->cdev->device.kobj,
+ "thermal_cooling");
+ if (result)
+ printk(KERN_ERR PREFIX "Create sysfs link\n");
+ result = sysfs_create_link(&device->cdev->device.kobj,
+ &device->dev->dev.kobj,
+ "device");
+ if (result)
+ printk(KERN_ERR PREFIX "Create sysfs link\n");
}
if (device->cap._DCS && device->cap._DSS){
static int count = 0;
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 4/5] drivers/acpi: elide a non-zero test on a result that is never 0
2008-03-24 18:10 [PATCH 4/5] drivers/acpi: elide a non-zero test on a result that is never 0 Julia Lawall
@ 2008-03-25 7:50 ` Zhang, Rui
2008-03-25 8:35 ` Julia Lawall
2008-03-25 8:41 ` Julia Lawall
2008-03-25 8:31 ` Zhang, Rui
1 sibling, 2 replies; 7+ messages in thread
From: Zhang, Rui @ 2008-03-25 7:50 UTC (permalink / raw)
To: Julia Lawall; +Cc: Brown, Len, linux-acpi, linux-kernel, kernel-janitors
On Tue, 2008-03-25 at 02:10 +0800, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> 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>
Patch looks correct. Thanks, Julia.
But it misses the same problem in driver/misc/intel_menlow.c.
And the return value of thermal_zone_device_register is also misused.
How about this refreshed patch? :)
Check the return value of thermal zone/cooling device registration correctly.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
drivers/acpi/fan.c | 3 +--
drivers/acpi/processor_core.c | 3 +--
drivers/acpi/thermal.c | 2 +-
drivers/acpi/video.c | 3 +--
drivers/misc/intel_menlow.c | 4 +---
5 files changed, 5 insertions(+), 10 deletions(-)
Index: linux-2.6/drivers/acpi/fan.c
===================================================================
--- linux-2.6.orig/drivers/acpi/fan.c
+++ linux-2.6/drivers/acpi/fan.c
@@ -259,8 +259,7 @@ static int acpi_fan_add(struct acpi_devi
if (IS_ERR(cdev)) {
result = PTR_ERR(cdev);
goto end;
- }
- if (cdev) {
+ } else {
printk(KERN_INFO PREFIX
"%s is registered as cooling_device%d\n",
device->dev.bus_id, cdev->id);
Index: linux-2.6/drivers/acpi/processor_core.c
===================================================================
--- linux-2.6.orig/drivers/acpi/processor_core.c
+++ linux-2.6/drivers/acpi/processor_core.c
@@ -673,8 +673,7 @@ static int __cpuinit acpi_processor_star
if (IS_ERR(pr->cdev)) {
result = PTR_ERR(pr->cdev);
goto end;
- }
- if (pr->cdev) {
+ } else {
printk(KERN_INFO PREFIX
"%s is registered as cooling_device%d\n",
device->dev.bus_id, pr->cdev->id);
Index: linux-2.6/drivers/acpi/thermal.c
===================================================================
--- linux-2.6.orig/drivers/acpi/thermal.c
+++ linux-2.6/drivers/acpi/thermal.c
@@ -1125,7 +1125,7 @@ static int acpi_thermal_register_thermal
tz->trips.active[i].flags.valid; i++, trips++);
tz->thermal_zone = thermal_zone_device_register("ACPI thermal zone",
trips, tz, &acpi_thermal_zone_ops);
- if (!tz->thermal_zone)
+ if (IS_ERR(tz->thermal_zone))
return -ENODEV;
result = sysfs_create_link(&tz->device->dev.kobj,
Index: linux-2.6/drivers/acpi/video.c
===================================================================
--- linux-2.6.orig/drivers/acpi/video.c
+++ linux-2.6/drivers/acpi/video.c
@@ -733,8 +733,7 @@ static void acpi_video_device_find_cap(s
device->dev, &video_cooling_ops);
if (IS_ERR(device->cdev))
return;
-
- if (device->cdev) {
+ else {
printk(KERN_INFO PREFIX
"%s is registered as cooling_device%d\n",
device->dev->dev.bus_id, device->cdev->id);
Index: linux-2.6/drivers/misc/intel_menlow.c
===================================================================
--- linux-2.6.orig/drivers/misc/intel_menlow.c
+++ linux-2.6/drivers/misc/intel_menlow.c
@@ -173,9 +173,7 @@ static int intel_menlow_memory_add(struc
if (IS_ERR(cdev)) {
result = PTR_ERR(cdev);
goto end;
- }
-
- if (cdev) {
+ } else {
acpi_driver_data(device) = cdev;
result = sysfs_create_link(&device->dev.kobj,
&cdev->device.kobj, "thermal_cooling");
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 4/5] drivers/acpi: elide a non-zero test on a result that is never 0
2008-03-25 7:50 ` Zhang, Rui
@ 2008-03-25 8:35 ` Julia Lawall
2008-03-25 8:30 ` Zhang, Rui
2008-03-25 8:41 ` Julia Lawall
1 sibling, 1 reply; 7+ messages in thread
From: Julia Lawall @ 2008-03-25 8:35 UTC (permalink / raw)
To: Zhang, Rui; +Cc: Brown, Len, linux-acpi, linux-kernel, kernel-janitors
On Tue, 25 Mar 2008, Zhang, Rui wrote:
>
> On Tue, 2008-03-25 at 02:10 +0800, Julia Lawall wrote:
> > From: Julia Lawall <julia@diku.dk>
> >
> > 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>
> Patch looks correct. Thanks, Julia.
> But it misses the same problem in driver/misc/intel_menlow.c.
I did that one in a separate patch ([PATCH 5/5]), since it is in a
different directory.
Your patch is certainly more concise, but perhaps it is a little strange
to put an "else" on an if where the "then" branch ends with a return or
goto? That doesn't seem to be done very often anyway.
julia
> And the return value of thermal_zone_device_register is also misused.
> How about this refreshed patch? :)
>
>
> Check the return value of thermal zone/cooling device registration correctly.
>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> ---
> drivers/acpi/fan.c | 3 +--
> drivers/acpi/processor_core.c | 3 +--
> drivers/acpi/thermal.c | 2 +-
> drivers/acpi/video.c | 3 +--
> drivers/misc/intel_menlow.c | 4 +---
> 5 files changed, 5 insertions(+), 10 deletions(-)
>
> Index: linux-2.6/drivers/acpi/fan.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/fan.c
> +++ linux-2.6/drivers/acpi/fan.c
> @@ -259,8 +259,7 @@ static int acpi_fan_add(struct acpi_devi
> if (IS_ERR(cdev)) {
> result = PTR_ERR(cdev);
> goto end;
> - }
> - if (cdev) {
> + } else {
> printk(KERN_INFO PREFIX
> "%s is registered as cooling_device%d\n",
> device->dev.bus_id, cdev->id);
> Index: linux-2.6/drivers/acpi/processor_core.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/processor_core.c
> +++ linux-2.6/drivers/acpi/processor_core.c
> @@ -673,8 +673,7 @@ static int __cpuinit acpi_processor_star
> if (IS_ERR(pr->cdev)) {
> result = PTR_ERR(pr->cdev);
> goto end;
> - }
> - if (pr->cdev) {
> + } else {
> printk(KERN_INFO PREFIX
> "%s is registered as cooling_device%d\n",
> device->dev.bus_id, pr->cdev->id);
> Index: linux-2.6/drivers/acpi/thermal.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/thermal.c
> +++ linux-2.6/drivers/acpi/thermal.c
> @@ -1125,7 +1125,7 @@ static int acpi_thermal_register_thermal
> tz->trips.active[i].flags.valid; i++, trips++);
> tz->thermal_zone = thermal_zone_device_register("ACPI thermal zone",
> trips, tz, &acpi_thermal_zone_ops);
> - if (!tz->thermal_zone)
> + if (IS_ERR(tz->thermal_zone))
> return -ENODEV;
>
> result = sysfs_create_link(&tz->device->dev.kobj,
> Index: linux-2.6/drivers/acpi/video.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/video.c
> +++ linux-2.6/drivers/acpi/video.c
> @@ -733,8 +733,7 @@ static void acpi_video_device_find_cap(s
> device->dev, &video_cooling_ops);
> if (IS_ERR(device->cdev))
> return;
> -
> - if (device->cdev) {
> + else {
> printk(KERN_INFO PREFIX
> "%s is registered as cooling_device%d\n",
> device->dev->dev.bus_id, device->cdev->id);
> Index: linux-2.6/drivers/misc/intel_menlow.c
> ===================================================================
> --- linux-2.6.orig/drivers/misc/intel_menlow.c
> +++ linux-2.6/drivers/misc/intel_menlow.c
> @@ -173,9 +173,7 @@ static int intel_menlow_memory_add(struc
> if (IS_ERR(cdev)) {
> result = PTR_ERR(cdev);
> goto end;
> - }
> -
> - if (cdev) {
> + } else {
> acpi_driver_data(device) = cdev;
> result = sysfs_create_link(&device->dev.kobj,
> &cdev->device.kobj, "thermal_cooling");
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 4/5] drivers/acpi: elide a non-zero test on a result that is never 0
2008-03-25 8:35 ` Julia Lawall
@ 2008-03-25 8:30 ` Zhang, Rui
2008-03-25 8:51 ` Julia Lawall
0 siblings, 1 reply; 7+ messages in thread
From: Zhang, Rui @ 2008-03-25 8:30 UTC (permalink / raw)
To: Julia Lawall; +Cc: Brown, Len, linux-acpi, linux-kernel, kernel-janitors
Hi, Julia,
On Tue, 2008-03-25 at 16:35 +0800, Julia Lawall wrote:
> On Tue, 25 Mar 2008, Zhang, Rui wrote:
>
> >
> > On Tue, 2008-03-25 at 02:10 +0800, Julia Lawall wrote:
> > > From: Julia Lawall <julia@diku.dk>
> > >
> > > 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>
> > Patch looks correct. Thanks, Julia.
> > But it misses the same problem in driver/misc/intel_menlow.c.
>
> I did that one in a separate patch ([PATCH 5/5]), since it is in a
> different directory.
That's great. thanks.
> Your patch is certainly more concise, but perhaps it is a little
> strange
> to put an "else" on an if where the "then" branch ends with a return
> or
> goto? That doesn't seem to be done very often anyway.
>
> > And the return value of thermal_zone_device_register is also
> misused.
I guess you didn't fix this one, right?
Len, please apply this patch.:)
Check the return value of thermal zone device registration correctly.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
drivers/acpi/thermal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux-2.6/drivers/acpi/thermal.c
===================================================================
--- linux-2.6.orig/drivers/acpi/thermal.c
+++ linux-2.6/drivers/acpi/thermal.c
@@ -1125,7 +1125,7 @@ static int acpi_thermal_register_thermal
tz->trips.active[i].flags.valid; i++, trips++);
tz->thermal_zone = thermal_zone_device_register("ACPI thermal zone",
trips, tz, &acpi_thermal_zone_ops);
- if (!tz->thermal_zone)
+ if (IS_ERR(tz->thermal_zone))
return -ENODEV;
result = sysfs_create_link(&tz->device->dev.kobj,
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 4/5] drivers/acpi: elide a non-zero test on a result that is never 0
2008-03-25 8:30 ` Zhang, Rui
@ 2008-03-25 8:51 ` Julia Lawall
0 siblings, 0 replies; 7+ messages in thread
From: Julia Lawall @ 2008-03-25 8:51 UTC (permalink / raw)
To: Zhang, Rui; +Cc: Brown, Len, linux-acpi, linux-kernel, kernel-janitors
> > > And the return value of thermal_zone_device_register is also
> > misused.
> I guess you didn't fix this one, right?
> Len, please apply this patch.:)
Indeed, I did not fix this one. So your patch should be used in this
case.
julia
>
>
> Check the return value of thermal zone device registration correctly.
>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> ---
> drivers/acpi/thermal.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6/drivers/acpi/thermal.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/thermal.c
> +++ linux-2.6/drivers/acpi/thermal.c
> @@ -1125,7 +1125,7 @@ static int acpi_thermal_register_thermal
> tz->trips.active[i].flags.valid; i++, trips++);
> tz->thermal_zone = thermal_zone_device_register("ACPI thermal zone",
> trips, tz, &acpi_thermal_zone_ops);
> - if (!tz->thermal_zone)
> + if (IS_ERR(tz->thermal_zone))
> return -ENODEV;
>
> result = sysfs_create_link(&tz->device->dev.kobj,
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 4/5] drivers/acpi: elide a non-zero test on a result that is never 0
2008-03-25 7:50 ` Zhang, Rui
2008-03-25 8:35 ` Julia Lawall
@ 2008-03-25 8:41 ` Julia Lawall
1 sibling, 0 replies; 7+ messages in thread
From: Julia Lawall @ 2008-03-25 8:41 UTC (permalink / raw)
To: Zhang, Rui; +Cc: Brown, Len, linux-acpi, linux-kernel, kernel-janitors
> And the return value of thermal_zone_device_register is also misused.
Indeed, I missed that one.
julia
> How about this refreshed patch? :)
>
>
> Check the return value of thermal zone/cooling device registration correctly.
>
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> ---
> drivers/acpi/fan.c | 3 +--
> drivers/acpi/processor_core.c | 3 +--
> drivers/acpi/thermal.c | 2 +-
> drivers/acpi/video.c | 3 +--
> drivers/misc/intel_menlow.c | 4 +---
> 5 files changed, 5 insertions(+), 10 deletions(-)
>
> Index: linux-2.6/drivers/acpi/fan.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/fan.c
> +++ linux-2.6/drivers/acpi/fan.c
> @@ -259,8 +259,7 @@ static int acpi_fan_add(struct acpi_devi
> if (IS_ERR(cdev)) {
> result = PTR_ERR(cdev);
> goto end;
> - }
> - if (cdev) {
> + } else {
> printk(KERN_INFO PREFIX
> "%s is registered as cooling_device%d\n",
> device->dev.bus_id, cdev->id);
> Index: linux-2.6/drivers/acpi/processor_core.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/processor_core.c
> +++ linux-2.6/drivers/acpi/processor_core.c
> @@ -673,8 +673,7 @@ static int __cpuinit acpi_processor_star
> if (IS_ERR(pr->cdev)) {
> result = PTR_ERR(pr->cdev);
> goto end;
> - }
> - if (pr->cdev) {
> + } else {
> printk(KERN_INFO PREFIX
> "%s is registered as cooling_device%d\n",
> device->dev.bus_id, pr->cdev->id);
> Index: linux-2.6/drivers/acpi/thermal.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/thermal.c
> +++ linux-2.6/drivers/acpi/thermal.c
> @@ -1125,7 +1125,7 @@ static int acpi_thermal_register_thermal
> tz->trips.active[i].flags.valid; i++, trips++);
> tz->thermal_zone = thermal_zone_device_register("ACPI thermal zone",
> trips, tz, &acpi_thermal_zone_ops);
> - if (!tz->thermal_zone)
> + if (IS_ERR(tz->thermal_zone))
> return -ENODEV;
>
> result = sysfs_create_link(&tz->device->dev.kobj,
> Index: linux-2.6/drivers/acpi/video.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/video.c
> +++ linux-2.6/drivers/acpi/video.c
> @@ -733,8 +733,7 @@ static void acpi_video_device_find_cap(s
> device->dev, &video_cooling_ops);
> if (IS_ERR(device->cdev))
> return;
> -
> - if (device->cdev) {
> + else {
> printk(KERN_INFO PREFIX
> "%s is registered as cooling_device%d\n",
> device->dev->dev.bus_id, device->cdev->id);
> Index: linux-2.6/drivers/misc/intel_menlow.c
> ===================================================================
> --- linux-2.6.orig/drivers/misc/intel_menlow.c
> +++ linux-2.6/drivers/misc/intel_menlow.c
> @@ -173,9 +173,7 @@ static int intel_menlow_memory_add(struc
> if (IS_ERR(cdev)) {
> result = PTR_ERR(cdev);
> goto end;
> - }
> -
> - if (cdev) {
> + } else {
> acpi_driver_data(device) = cdev;
> result = sysfs_create_link(&device->dev.kobj,
> &cdev->device.kobj, "thermal_cooling");
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 4/5] drivers/acpi: elide a non-zero test on a result that is never 0
2008-03-24 18:10 [PATCH 4/5] drivers/acpi: elide a non-zero test on a result that is never 0 Julia Lawall
2008-03-25 7:50 ` Zhang, Rui
@ 2008-03-25 8:31 ` Zhang, Rui
1 sibling, 0 replies; 7+ messages in thread
From: Zhang, Rui @ 2008-03-25 8:31 UTC (permalink / raw)
To: Julia Lawall; +Cc: Brown, Len, linux-acpi, linux-kernel, kernel-janitors
On Tue, 2008-03-25 at 02:10 +0800, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> 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>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
> ---
> drivers/acpi/fan.c | 34
> ++++++++++++++++------------------
> drivers/acpi/processor_core.c | 30 ++++++++++++++----------------
> drivers/acpi/video.c | 28 +++++++++++++---------------
> 3 files changed, 43 insertions(+), 49 deletions(-)
>
> diff -u -p a/drivers/acpi/fan.c b/drivers/acpi/fan.c
> --- a/drivers/acpi/fan.c 2008-03-12 14:13:13.000000000 +0100
> +++ b/drivers/acpi/fan.c 2008-03-24 16:14:50.000000000 +0100
> @@ -260,24 +260,22 @@ static int acpi_fan_add(struct acpi_devi
> 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);
> -
> - acpi_driver_data(device) = cdev;
> - result = sysfs_create_link(&device->dev.kobj,
> - &cdev->device.kobj,
> - "thermal_cooling");
> - if (result)
> - return result;
> -
> - result = sysfs_create_link(&cdev->device.kobj,
> - &device->dev.kobj,
> - "device");
> - if (result)
> - return result;
> - }
> + printk(KERN_INFO PREFIX
> + "%s is registered as cooling_device%d\n",
> + device->dev.bus_id, cdev->id);
> +
> + acpi_driver_data(device) = cdev;
> + result = sysfs_create_link(&device->dev.kobj,
> + &cdev->device.kobj,
> + "thermal_cooling");
> + if (result)
> + return result;
> +
> + result = sysfs_create_link(&cdev->device.kobj,
> + &device->dev.kobj,
> + "device");
> + if (result)
> + return result;
>
> result = acpi_fan_add_fs(device);
> if (result)
> diff -u -p a/drivers/acpi/processor_core.c
> b/drivers/acpi/processor_core.c
> --- a/drivers/acpi/processor_core.c 2008-03-12 14:13:13.000000000
> +0100
> +++ b/drivers/acpi/processor_core.c 2008-03-24 16:15:53.000000000
> +0100
> @@ -674,22 +674,20 @@ static int __cpuinit acpi_processor_star
> 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);
> -
> - result = sysfs_create_link(&device->dev.kobj,
> - &pr->cdev->device.kobj,
> - "thermal_cooling");
> - if (result)
> - return result;
> - result = sysfs_create_link(&pr->cdev->device.kobj,
> - &device->dev.kobj,
> - "device");
> - if (result)
> - return result;
> - }
> + printk(KERN_INFO PREFIX
> + "%s is registered as cooling_device%d\n",
> + device->dev.bus_id, pr->cdev->id);
> +
> + result = sysfs_create_link(&device->dev.kobj,
> + &pr->cdev->device.kobj,
> + "thermal_cooling");
> + if (result)
> + return result;
> + result = sysfs_create_link(&pr->cdev->device.kobj,
> + &device->dev.kobj,
> + "device");
> + if (result)
> + return result;
>
> if (pr->flags.throttling) {
> printk(KERN_INFO PREFIX "%s [%s] (supports",
> diff -u -p a/drivers/acpi/video.c b/drivers/acpi/video.c
> --- a/drivers/acpi/video.c 2008-03-12 14:13:13.000000000 +0100
> +++ b/drivers/acpi/video.c 2008-03-24 16:17:17.000000000 +0100
> @@ -734,21 +734,19 @@ static void acpi_video_device_find_cap(s
> 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);
> - result =
> sysfs_create_link(&device->dev->dev.kobj,
> - &device->cdev->device.kobj,
> - "thermal_cooling");
> - if (result)
> - printk(KERN_ERR PREFIX "Create sysfs
> link\n");
> - result =
> sysfs_create_link(&device->cdev->device.kobj,
> - &device->dev->dev.kobj,
> - "device");
> - if (result)
> - printk(KERN_ERR PREFIX "Create sysfs
> link\n");
> - }
> + printk(KERN_INFO PREFIX
> + "%s is registered as cooling_device%d\n",
> + device->dev->dev.bus_id, device->cdev->id);
> + result = sysfs_create_link(&device->dev->dev.kobj,
> + &device->cdev->device.kobj,
> + "thermal_cooling");
> + if (result)
> + printk(KERN_ERR PREFIX "Create sysfs link\n");
> + result = sysfs_create_link(&device->cdev->device.kobj,
> + &device->dev->dev.kobj,
> + "device");
> + if (result)
> + printk(KERN_ERR PREFIX "Create sysfs link\n");
> }
> if (device->cap._DCS && device->cap._DSS){
> static int count = 0;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi"
> in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2008-03-25 8:51 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-24 18:10 [PATCH 4/5] drivers/acpi: elide a non-zero test on a result that is never 0 Julia Lawall
2008-03-25 7:50 ` Zhang, Rui
2008-03-25 8:35 ` Julia Lawall
2008-03-25 8:30 ` Zhang, Rui
2008-03-25 8:51 ` Julia Lawall
2008-03-25 8:41 ` Julia Lawall
2008-03-25 8:31 ` Zhang, Rui
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®