From: Julia Lawall <julia@diku.dk>
To: "Zhang, Rui" <rui.zhang@intel.com>
Cc: "Brown, Len" <len.brown@intel.com>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH 4/5] drivers/acpi: elide a non-zero test on a result that is never 0
Date: Tue, 25 Mar 2008 09:41:16 +0100 (CET) [thread overview]
Message-ID: <Pine.LNX.4.64.0803250940270.22289@ask.diku.dk> (raw)
In-Reply-To: <1206431411.3047.45.camel@acpi-hp-zz.sh.intel.com>
> 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
>
next prev parent reply other threads:[~2008-03-25 8:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-24 18:10 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 [this message]
2008-03-25 8:31 ` Zhang, Rui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0803250940270.22289@ask.diku.dk \
--to=julia@diku.dk \
--cc=kernel-janitors@vger.kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®