Skip to content

Commit

Permalink
platform/x86: fujitsu-laptop: simplify error handling in acpi_fujitsu…
Browse files Browse the repository at this point in the history
…_laptop_add()

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>
  • Loading branch information
kempniu authored and dvhart committed Apr 19, 2017
1 parent 30943e1 commit d1c7073
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/platform/x86/fujitsu-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit d1c7073

Please sign in to comment.