From: Aaron Lu <aaron.lu@intel.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Zhang Rui <rui.zhang@intel.com>,
linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] ACPI / fan: remove no need check for device pointer
Date: Tue, 3 Dec 2013 16:28:30 +0800 [thread overview]
Message-ID: <1386059312-2990-3-git-send-email-aaron.lu@intel.com> (raw)
In-Reply-To: <1386059312-2990-1-git-send-email-aaron.lu@intel.com>
The device pointer will not be NULL in the PM callback and ACPI driver's
add/remove callback, so checking NULL for them isn't necessary.
Signed-off-by: Aaron Lu <aaron.lu@intel.com>
---
drivers/acpi/fan.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 9638d28513e8..4a624a35f07d 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -124,9 +124,6 @@ static int acpi_fan_add(struct acpi_device *device)
int result = 0;
struct thermal_cooling_device *cdev;
- if (!device)
- return -EINVAL;
-
strcpy(acpi_device_name(device), "Fan");
strcpy(acpi_device_class(device), ACPI_FAN_CLASS);
@@ -170,14 +167,7 @@ end:
static int acpi_fan_remove(struct acpi_device *device)
{
- struct thermal_cooling_device *cdev;
-
- if (!device)
- return -EINVAL;
-
- cdev = acpi_driver_data(device);
- if (!cdev)
- return -EINVAL;
+ struct thermal_cooling_device *cdev = acpi_driver_data(device);
sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
sysfs_remove_link(&cdev->device.kobj, "device");
@@ -189,9 +179,6 @@ static int acpi_fan_remove(struct acpi_device *device)
#ifdef CONFIG_PM_SLEEP
static int acpi_fan_suspend(struct device *dev)
{
- if (!dev)
- return -EINVAL;
-
acpi_bus_set_power(to_acpi_device(dev)->handle, ACPI_STATE_D0);
return AE_OK;
@@ -201,9 +188,6 @@ static int acpi_fan_resume(struct device *dev)
{
int result;
- if (!dev)
- return -EINVAL;
-
result = acpi_bus_update_power(to_acpi_device(dev)->handle, NULL);
if (result)
printk(KERN_ERR PREFIX "Error updating fan power state\n");
--
1.8.3.1
next prev parent reply other threads:[~2013-12-03 8:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-03 8:28 [PATCH 0/4] Convert ACPI fan driver to platform driver Aaron Lu
2013-12-03 8:28 ` [PATCH 1/4] ACPI / fan: remove unused macro for debug Aaron Lu
2013-12-03 8:28 ` Aaron Lu [this message]
2013-12-03 8:28 ` [PATCH 3/4] ACPI / fan: use acpi_device_xxx_power instead of acpi_bus equivelant Aaron Lu
2013-12-03 8:28 ` [PATCH 4/4] ACPI / fan: convert to platform driver Aaron Lu
2013-12-04 23:07 ` [PATCH 0/4] Convert ACPI fan driver " Rafael J. Wysocki
2013-12-04 23:09 ` Rafael J. Wysocki
2013-12-05 13:56 ` Zhang, Rui
2013-12-05 13:56 ` Zhang, Rui
2013-12-05 22:14 ` Rafael J. Wysocki
2013-12-05 7:47 ` Aaron Lu
2013-12-05 22:02 ` Rafael J. Wysocki
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=1386059312-2990-3-git-send-email-aaron.lu@intel.com \
--to=aaron.lu@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.