lkml.org 
[lkml]   [2014]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/1] platform: x86: Deletion of checks before backlight_device_unregister()
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Mon, 24 Nov 2014 20:30:29 +0100

    The backlight_device_unregister() function tests whether its argument is NULL
    and then returns immediately. Thus the test around the call is not needed.

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/platform/x86/asus-laptop.c | 3 +--
    drivers/platform/x86/asus-wmi.c | 3 +--
    drivers/platform/x86/eeepc-laptop.c | 3 +--
    drivers/platform/x86/fujitsu-laptop.c | 6 ++----
    drivers/platform/x86/ideapad-laptop.c | 3 +--
    drivers/platform/x86/intel_oaktrail.c | 3 +--
    drivers/platform/x86/msi-wmi.c | 3 +--
    drivers/platform/x86/sony-laptop.c | 3 +--
    drivers/platform/x86/toshiba_acpi.c | 3 +--
    9 files changed, 10 insertions(+), 20 deletions(-)

    diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
    index 7f4dc6f..11fac1a 100644
    --- a/drivers/platform/x86/asus-laptop.c
    +++ b/drivers/platform/x86/asus-laptop.c
    @@ -843,8 +843,7 @@ static int asus_backlight_init(struct asus_laptop *asus)

    static void asus_backlight_exit(struct asus_laptop *asus)
    {
    - if (asus->backlight_device)
    - backlight_device_unregister(asus->backlight_device);
    + backlight_device_unregister(asus->backlight_device);
    asus->backlight_device = NULL;
    }

    diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
    index 21fc932..7543a56 100644
    --- a/drivers/platform/x86/asus-wmi.c
    +++ b/drivers/platform/x86/asus-wmi.c
    @@ -1308,8 +1308,7 @@ static int asus_wmi_backlight_init(struct asus_wmi *asus)

    static void asus_wmi_backlight_exit(struct asus_wmi *asus)
    {
    - if (asus->backlight_device)
    - backlight_device_unregister(asus->backlight_device);
    + backlight_device_unregister(asus->backlight_device);

    asus->backlight_device = NULL;
    }
    diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
    index bd533c2..9bc7eb7 100644
    --- a/drivers/platform/x86/eeepc-laptop.c
    +++ b/drivers/platform/x86/eeepc-laptop.c
    @@ -1158,8 +1158,7 @@ static int eeepc_backlight_init(struct eeepc_laptop *eeepc)

    static void eeepc_backlight_exit(struct eeepc_laptop *eeepc)
    {
    - if (eeepc->backlight_device)
    - backlight_device_unregister(eeepc->backlight_device);
    + backlight_device_unregister(eeepc->backlight_device);
    eeepc->backlight_device = NULL;
    }

    diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
    index 87aa28c..f1a670b 100644
    --- a/drivers/platform/x86/fujitsu-laptop.c
    +++ b/drivers/platform/x86/fujitsu-laptop.c
    @@ -1147,8 +1147,7 @@ fail_hotkey1:
    fail_hotkey:
    platform_driver_unregister(&fujitsupf_driver);
    fail_backlight:
    - if (fujitsu->bl_device)
    - backlight_device_unregister(fujitsu->bl_device);
    + backlight_device_unregister(fujitsu->bl_device);
    fail_sysfs_group:
    sysfs_remove_group(&fujitsu->pf_device->dev.kobj,
    &fujitsupf_attribute_group);
    @@ -1172,8 +1171,7 @@ static void __exit fujitsu_cleanup(void)

    platform_driver_unregister(&fujitsupf_driver);

    - if (fujitsu->bl_device)
    - backlight_device_unregister(fujitsu->bl_device);
    + backlight_device_unregister(fujitsu->bl_device);

    sysfs_remove_group(&fujitsu->pf_device->dev.kobj,
    &fujitsupf_attribute_group);
    diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
    index ed494f3..3163061 100644
    --- a/drivers/platform/x86/ideapad-laptop.c
    +++ b/drivers/platform/x86/ideapad-laptop.c
    @@ -729,8 +729,7 @@ static int ideapad_backlight_init(struct ideapad_private *priv)

    static void ideapad_backlight_exit(struct ideapad_private *priv)
    {
    - if (priv->blightdev)
    - backlight_device_unregister(priv->blightdev);
    + backlight_device_unregister(priv->blightdev);
    priv->blightdev = NULL;
    }

    diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
    index 4bc9604..0dd72cf 100644
    --- a/drivers/platform/x86/intel_oaktrail.c
    +++ b/drivers/platform/x86/intel_oaktrail.c
    @@ -271,8 +271,7 @@ static int oaktrail_backlight_init(void)

    static void oaktrail_backlight_exit(void)
    {
    - if (oaktrail_bl_device)
    - backlight_device_unregister(oaktrail_bl_device);
    + backlight_device_unregister(oaktrail_bl_device);
    }

    static int oaktrail_probe(struct platform_device *pdev)
    diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
    index 70222f2..6d2bac0 100644
    --- a/drivers/platform/x86/msi-wmi.c
    +++ b/drivers/platform/x86/msi-wmi.c
    @@ -354,8 +354,7 @@ static void __exit msi_wmi_exit(void)
    sparse_keymap_free(msi_wmi_input_dev);
    input_unregister_device(msi_wmi_input_dev);
    }
    - if (backlight)
    - backlight_device_unregister(backlight);
    + backlight_device_unregister(backlight);
    }

    module_init(msi_wmi_init);
    diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
    index 26ad9ff..a48cdc7 100644
    --- a/drivers/platform/x86/sony-laptop.c
    +++ b/drivers/platform/x86/sony-laptop.c
    @@ -3141,8 +3141,7 @@ static void sony_nc_backlight_setup(void)

    static void sony_nc_backlight_cleanup(void)
    {
    - if (sony_bl_props.dev)
    - backlight_device_unregister(sony_bl_props.dev);
    + backlight_device_unregister(sony_bl_props.dev);
    }

    static int sony_nc_add(struct acpi_device *device)
    diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
    index d0dce73..703a68a 100644
    --- a/drivers/platform/x86/toshiba_acpi.c
    +++ b/drivers/platform/x86/toshiba_acpi.c
    @@ -1647,8 +1647,7 @@ static int toshiba_acpi_remove(struct acpi_device *acpi_dev)
    rfkill_destroy(dev->bt_rfk);
    }

    - if (dev->backlight_dev)
    - backlight_device_unregister(dev->backlight_dev);
    + backlight_device_unregister(dev->backlight_dev);

    if (dev->illumination_supported)
    led_classdev_unregister(&dev->led_dev);
    --
    2.1.3


    \
     
     \ /
      Last update: 2014-11-24 21:21    [W:4.037 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site