lkml.org 
[lkml]   [2013]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] ACPI / fan: remove no need check for device pointer
    Date
    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


    \
     
     \ /
      Last update: 2013-12-03 09:41    [W:4.608 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site