lkml.org 
[lkml]   [2014]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/8] eeepc-laptop: clean up control flow in eeepc_acpi_notify
    Date
    eeepc_acpi_notify increases the indentation level to a whopping four. If
    we revise the conditions a bit, we can reduce that to a more soothing
    two and satisfy the indentation guidelines in Documentation/CodingStyle.

    Remove an unwanted space while we're in the neighbourhood.

    Signed-off-by: Frans Klaver <fransklaver@gmail.com>
    ---
    drivers/platform/x86/eeepc-laptop.c | 53 ++++++++++++++++++-------------------
    1 file changed, 26 insertions(+), 27 deletions(-)

    diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
    index 73e8d39..21ffe1f 100644
    --- a/drivers/platform/x86/eeepc-laptop.c
    +++ b/drivers/platform/x86/eeepc-laptop.c
    @@ -1213,7 +1213,7 @@ static void eeepc_input_exit(struct eeepc_laptop *eeepc)
    static void eeepc_input_notify(struct eeepc_laptop *eeepc, int event)
    {
    if (!eeepc->inputdev)
    - return ;
    + return;
    if (!sparse_keymap_report_event(eeepc->inputdev, event, 1, true))
    pr_info("Unknown key %x pressed\n", event);
    }
    @@ -1222,6 +1222,7 @@ static void eeepc_acpi_notify(struct acpi_device *device, u32 event)
    {
    struct eeepc_laptop *eeepc = acpi_driver_data(device);
    u16 count;
    + int old_brightness, new_brightness;

    if (event > ACPI_MAX_SYS_NOTIFY)
    return;
    @@ -1231,34 +1232,32 @@ static void eeepc_acpi_notify(struct acpi_device *device, u32 event)
    count);

    /* Brightness events are special */
    - if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX) {
    -
    - /* Ignore them completely if the acpi video driver is used */
    - if (eeepc->backlight_device != NULL) {
    - int old_brightness, new_brightness;
    -
    - /* Update the backlight device. */
    - old_brightness = eeepc_backlight_notify(eeepc);
    -
    - /* Convert event to keypress (obsolescent hack) */
    - new_brightness = event - NOTIFY_BRN_MIN;
    -
    - if (new_brightness < old_brightness) {
    - event = NOTIFY_BRN_MIN; /* brightness down */
    - } else if (new_brightness > old_brightness) {
    - event = NOTIFY_BRN_MAX; /* brightness up */
    - } else {
    - /*
    - * no change in brightness - already at min/max,
    - * event will be desired value (or else ignored)
    - */
    - }
    - eeepc_input_notify(eeepc, event);
    - }
    - } else {
    - /* Everything else is a bona-fide keypress event */
    + if (event < NOTIFY_BRN_MIN || event > NOTIFY_BRN_MAX) {
    eeepc_input_notify(eeepc, event);
    + return;
    + }
    +
    + /* Ignore them completely if the acpi video driver is used */
    + if (!eeepc->backlight_device)
    + return;
    +
    + /* Update the backlight device. */
    + old_brightness = eeepc_backlight_notify(eeepc);
    +
    + /* Convert event to keypress (obsolescent hack) */
    + new_brightness = event - NOTIFY_BRN_MIN;
    +
    + if (new_brightness < old_brightness) {
    + event = NOTIFY_BRN_MIN; /* brightness down */
    + } else if (new_brightness > old_brightness) {
    + event = NOTIFY_BRN_MAX; /* brightness up */
    + } else {
    + /*
    + * no change in brightness - already at min/max,
    + * event will be desired value (or else ignored)
    + */
    }
    + eeepc_input_notify(eeepc, event);
    }

    static void eeepc_dmi_check(struct eeepc_laptop *eeepc)
    --
    2.1.0


    \
     
     \ /
      Last update: 2014-10-22 21:41    [W:4.085 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site