platform/x86: fujitsu-laptop: simplify error handling in acpi_fujitsu_laptop_add()
authorMichał Kępień <kernel@kempniu.pl>
Fri, 7 Apr 2017 13:07:13 +0000 (15:07 +0200)
committerDarren Hart (VMware) <dvhart@infradead.org>
Wed, 19 Apr 2017 19:57:32 +0000 (12:57 -0700)
As LED class devices registered by fujitsu-laptop no longer depend on
the platform device, two function calls inside acpi_fujitsu_laptop_add()
can be rearranged in order to simplify error handling.

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 7d0d1e046d21684807e3ece87cdd09cd56188e66..7f49d92914c927e582579a0afe9d11b950690d12 100644 (file)
@@ -845,18 +845,16 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device)
                        fujitsu_bl->bl_device->props.power = FB_BLANK_UNBLANK;
        }
 
-       error = fujitsu_laptop_platform_add();
+       error = acpi_fujitsu_laptop_leds_register(device);
        if (error)
                goto err_free_fifo;
 
-       error = acpi_fujitsu_laptop_leds_register(device);
+       error = fujitsu_laptop_platform_add();
        if (error)
-               goto err_remove_platform_device;
+               goto err_free_fifo;
 
        return 0;
 
-err_remove_platform_device:
-       fujitsu_laptop_platform_remove();
 err_free_fifo:
        kfifo_free(&fujitsu_laptop->fifo);
 err_stop: