Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c495d62 authored by Michał Kępień's avatar Michał Kępień Committed by Darren Hart (VMware)
Browse files

platform/x86: fujitsu-laptop: remove redundant fields from struct fujitsu_bl 



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: default avatarMichał Kępień <kernel@kempniu.pl>
Reviewed-by: default avatarJonathan Woithe <jwoithe@just42.net>
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
parent 5959ddd0

drivers/platform/x86/fujitsu-laptop.c

+2 −13
Original line number Original line Diff line number Diff line
@@ -135,13 +135,10 @@ 
/* Device controlling the backlight and associated keys */

/* Device controlling the backlight and associated keys */

struct fujitsu_bl {

struct fujitsu_bl {

	acpi_handle acpi_handle;

	acpi_handle acpi_handle;

	struct acpi_device *dev;

	struct input_dev *input;

	struct input_dev *input;

	char phys[32];

	char phys[32];

	struct backlight_device *bl_device;

	struct backlight_device *bl_device;



	unsigned int max_brightness;

	unsigned int max_brightness;

	unsigned int brightness_changed;

	unsigned int brightness_level;

	unsigned int brightness_level;

};

};
@@ -394,11 +391,6 @@ static int get_lcd_level(void) 




	fujitsu_bl->brightness_level = state & 0x0fffffff;

	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;

	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),

	       acpi_device_name(device), acpi_device_bid(device),

	       !device->power.state ? "on" : "off");

	       !device->power.state ? "on" : "off");





	fujitsu_bl->dev = device;



	if (acpi_has_method(device->handle, METHOD_NAME__INI)) {

	if (acpi_has_method(device->handle, METHOD_NAME__INI)) {

		vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n");

		vdbg_printk(FUJLAPTOP_DBG_INFO, "Invoking _INI\n");

		if (ACPI_FAILURE

		if (ACPI_FAILURE
@@ -618,9 +608,8 @@ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event) 
	get_lcd_level();

	get_lcd_level();

	newb = fujitsu_bl->brightness_level;

	newb = fujitsu_bl->brightness_level;





	vdbg_printk(FUJLAPTOP_DBG_TRACE,

	vdbg_printk(FUJLAPTOP_DBG_TRACE, "brightness button event [%i -> %i]\n",

		    "brightness button event [%i -> %i (%i)]\n",

		    oldb, newb);

		    oldb, newb, fujitsu_bl->brightness_changed);





	if (oldb == newb)

	if (oldb == newb)

		return;

		return;