lkml.org 
[lkml]   [2017]   [Apr]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/6] platform/x86: fujitsu-laptop: simplify error handling in acpi_fujitsu_laptop_add()
    Date
    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>
    ---
    drivers/platform/x86/fujitsu-laptop.c | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
    index 177b9b57ac2f..2d3d0e4083dc 100644
    --- a/drivers/platform/x86/fujitsu-laptop.c
    +++ b/drivers/platform/x86/fujitsu-laptop.c
    @@ -860,18 +860,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:
    --
    2.12.2
    \
     
     \ /
      Last update: 2017-04-07 15:09    [W:5.630 / U:0.680 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site