[PATCH v2 11/11] platform/x86: fujitsu-laptop: remove redundant fields from struct fujitsu_bl

[Michał Kępień]

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ń 
---
 drivers/platform/x86/fujitsu-laptop.c | 15 ++-
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/platform/x86/fujitsu-laptop.c 
b/drivers/platform/x86/fujitsu-laptop.c
index f58a33d70be3..9fd5b98aeef8 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -135,13 +135,10 @@
 /* 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;
 };
 
@@ -409,11 +406,6 @@ static int get_lcd_level(void)
 
fujitsu_bl->brightness_level = state & 0x0fff;
 
-   if (state & 0x8000)
-   fujitsu_bl->brightness_changed = 1;
-   else
-   fujitsu_bl->brightness_changed = 0;
-
return fujitsu_bl->brightness_level;
 }
 
@@ -592,8 +584,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
@@ -633,9 +623,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;
-- 
2.12.2

[PATCH v2 11/11] platform/x86: fujitsu-laptop: remove redundant fields from struct fujitsu_bl

[Michał Kępień]

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ń 
---
 drivers/platform/x86/fujitsu-laptop.c | 15 ++-
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/platform/x86/fujitsu-laptop.c 
b/drivers/platform/x86/fujitsu-laptop.c
index f58a33d70be3..9fd5b98aeef8 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -135,13 +135,10 @@
 /* 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;
 };
 
@@ -409,11 +406,6 @@ static int get_lcd_level(void)
 
fujitsu_bl->brightness_level = state & 0x0fff;
 
-   if (state & 0x8000)
-   fujitsu_bl->brightness_changed = 1;
-   else
-   fujitsu_bl->brightness_changed = 0;
-
return fujitsu_bl->brightness_level;
 }
 
@@ -592,8 +584,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
@@ -633,9 +623,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;
-- 
2.12.2