]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
platform/x86: fujitsu-laptop: remove redundant fields from struct fujitsu_bl
authorMichał Kępień <kernel@kempniu.pl>
Wed, 5 Apr 2017 06:49:10 +0000 (08:49 +0200)
committerDarren Hart (VMware) <dvhart@infradead.org>
Thu, 13 Apr 2017 17:16:07 +0000 (10:16 -0700)
The dev field of struct fujitsu_bl is assigned in acpi_fujitsu_bl_add(),
but never used afterwards.  brightness_changed is set in get_lcd_level()
and then its value is only printed in a debug message, so it does not
influence execution flow.  Remove both fields as they are redundant.
Update the aforementioned debug message.  Adjust whitespace to make
checkpatch happy.

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 b881721340631c93dee1a8105d56a2f7fc939855..84b5614158758048ed499830f155d893285ebb20 100644 (file)
 /* Device controlling the backlight and associated keys */
 struct fujitsu_bl {
        acpi_handle acpi_handle;
-       struct acpi_device *dev;
        struct input_dev *input;
        char phys[32];
        struct backlight_device *bl_device;
-
        unsigned int max_brightness;
-       unsigned int brightness_changed;
        unsigned int brightness_level;
 };
 
@@ -394,11 +391,6 @@ static int get_lcd_level(void)
 
        fujitsu_bl->brightness_level = state & 0x0fffffff;
 
-       if (state & 0x80000000)
-               fujitsu_bl->brightness_changed = 1;
-       else
-               fujitsu_bl->brightness_changed = 0;
-
        return fujitsu_bl->brightness_level;
 }
 
@@ -577,8 +569,6 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device)
               acpi_device_name(device), acpi_device_bid(device),
               !device->power.state ? "on" : "off");
 
-       fujitsu_bl->dev = device;
-
        if (acpi_has_method(device->handle, METHOD_NAME__INI)) {
                vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n");
                if (ACPI_FAILURE
@@ -618,9 +608,8 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event)
        get_lcd_level();
        newb = fujitsu_bl->brightness_level;
 
-       vdbg_printk(FUJLAPTOP_DBG_TRACE,
-                   "brightness button event [%i -> %i (%i)]\n",
-                   oldb, newb, fujitsu_bl->brightness_changed);
+       vdbg_printk(FUJLAPTOP_DBG_TRACE, "brightness button event [%i -> %i]\n",
+                   oldb, newb);
 
        if (oldb == newb)
                return;