OSDN Git Service

platform/x86: fujitsu-laptop: remove redundant safety checks
authorMichał Kępień <kernel@kempniu.pl>
Fri, 16 Jun 2017 04:40:53 +0000 (06:40 +0200)
committerDarren Hart (VMware) <dvhart@infradead.org>
Sat, 1 Jul 2017 03:13:02 +0000 (20:13 -0700)
Do not check whether the pointer passed to ACPI add callbacks is NULL as
it is earlier dereferenced anyway in the bus-level probe callback,
acpi_device_probe().

Do not check the value of acpi_disabled in fujitsu_init(), because it is
already done by acpi_bus_register_driver(), which is the first function
called by fujitsu_init().

Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Reviewed-by: Jonathan Woithe <jwoithe@just42.net>
Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
drivers/platform/x86/fujitsu-laptop.c

index 1c6fdd9..04796b2 100644 (file)
@@ -408,9 +408,6 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device)
        if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
                return -ENODEV;
 
-       if (!device)
-               return -EINVAL;
-
        priv = devm_kzalloc(&device->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
@@ -798,9 +795,6 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
        int error;
        int i;
 
-       if (!device)
-               return -EINVAL;
-
        priv = devm_kzalloc(&device->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
@@ -1019,9 +1013,6 @@ static int __init fujitsu_init(void)
 {
        int ret;
 
-       if (acpi_disabled)
-               return -ENODEV;
-
        ret = acpi_bus_register_driver(&acpi_fujitsu_bl_driver);
        if (ret)
                return ret;