Commit 66cb96af authored by Andres Salomon's avatar Andres Salomon Committed by Hans de Goede
Browse files

platform/x86:dell-laptop: remove duplicate code w/ battery function 



The dell battery patch added dell_send_request_for_tokenid() and
dell_set_std_token_value(), which encapsulates a very common pattern
when SMBIOS queries are addressed to token->location. This calls them
in various places outside of the dell laptop code, allowing us to delete
a bunch of code.

Also some very minor cleanups:
  - mark the kbd init functions as __init
  - don't read buffer.output unless dell_send_request() was successful.
  - actually return errors from micmute_led_set/mute_led_set instead of
    always returning 0.

Only minor behavior changes; the delayed read of buffer.output and
actually returning errors for the brightness_set_blocking hooks.

Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
Reviewed-by: default avatarPali Rohár <pali@kernel.org>
Link: https://lore.kernel.org/r/20240820033335.4f68b162@5400


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent ab58016c

drivers/platform/x86/dell/dell-laptop.c

+27 −82
Original line number Diff line number Diff line
@@ -937,43 +937,24 @@ static void dell_cleanup_rfkill(void) 
static int dell_send_intensity(struct backlight_device *bd)

{

	struct calling_interface_buffer buffer;

	struct calling_interface_token *token;

	int ret;



	token = dell_smbios_find_token(BRIGHTNESS_TOKEN);

	if (!token)

		return -ENODEV;



	dell_fill_request(&buffer,

			   token->location, bd->props.brightness, 0, 0);

	if (power_supply_is_system_supplied() > 0)

		ret = dell_send_request(&buffer,

					CLASS_TOKEN_WRITE, SELECT_TOKEN_AC);

	else

		ret = dell_send_request(&buffer,

					CLASS_TOKEN_WRITE, SELECT_TOKEN_BAT);

	u16 select;



	return ret;

	select = power_supply_is_system_supplied() > 0 ?

			SELECT_TOKEN_AC : SELECT_TOKEN_BAT;

	return dell_send_request_for_tokenid(&buffer, CLASS_TOKEN_WRITE,

			select, BRIGHTNESS_TOKEN, bd->props.brightness);

}



static int dell_get_intensity(struct backlight_device *bd)

{

	struct calling_interface_buffer buffer;

	struct calling_interface_token *token;

	int ret;

	u16 select;



	token = dell_smbios_find_token(BRIGHTNESS_TOKEN);

	if (!token)

		return -ENODEV;



	dell_fill_request(&buffer, token->location, 0, 0, 0);

	if (power_supply_is_system_supplied() > 0)

		ret = dell_send_request(&buffer,

					CLASS_TOKEN_READ, SELECT_TOKEN_AC);

	else

		ret = dell_send_request(&buffer,

					CLASS_TOKEN_READ, SELECT_TOKEN_BAT);



	select = power_supply_is_system_supplied() > 0 ?

			SELECT_TOKEN_AC : SELECT_TOKEN_BAT;

	ret = dell_send_request_for_tokenid(&buffer, CLASS_TOKEN_READ,

			select, BRIGHTNESS_TOKEN, 0);

	if (ret == 0)

		ret = buffer.output[1];
@@ -1397,20 +1378,11 @@ static int kbd_set_state_safe(struct kbd_state *state, struct kbd_state *old) 
static int kbd_set_token_bit(u8 bit)

{

	struct calling_interface_buffer buffer;

	struct calling_interface_token *token;

	int ret;



	if (bit >= ARRAY_SIZE(kbd_tokens))

		return -EINVAL;



	token = dell_smbios_find_token(kbd_tokens[bit]);

	if (!token)

		return -EINVAL;



	dell_fill_request(&buffer, token->location, token->value, 0, 0);

	ret = dell_send_request(&buffer, CLASS_TOKEN_WRITE, SELECT_TOKEN_STD);



	return ret;

	return dell_set_std_token_value(&buffer, kbd_tokens[bit], USE_TVAL);

}



static int kbd_get_token_bit(u8 bit)
@@ -1429,11 +1401,10 @@ static int kbd_get_token_bit(u8 bit) 


	dell_fill_request(&buffer, token->location, 0, 0, 0);

	ret = dell_send_request(&buffer, CLASS_TOKEN_READ, SELECT_TOKEN_STD);

	val = buffer.output[1];



	if (ret)

		return ret;



	val = buffer.output[1];

	return (val == token->value);

}
@@ -1539,7 +1510,7 @@ static inline int kbd_init_info(void) 


}



static inline void kbd_init_tokens(void)

static inline void __init kbd_init_tokens(void)

{

	int i;
@@ -1548,7 +1519,7 @@ static inline void kbd_init_tokens(void) 
			kbd_token_bits |= BIT(i);

}



static void kbd_init(void)

static void __init kbd_init(void)

{

	int ret;
@@ -2173,21 +2144,11 @@ static int micmute_led_set(struct led_classdev *led_cdev, 
			   enum led_brightness brightness)

{

	struct calling_interface_buffer buffer;

	struct calling_interface_token *token;

	int state = brightness != LED_OFF;



	if (state == 0)

		token = dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE);

	else

		token = dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE);



	if (!token)

		return -ENODEV;

	u32 tokenid;



	dell_fill_request(&buffer, token->location, token->value, 0, 0);

	dell_send_request(&buffer, CLASS_TOKEN_WRITE, SELECT_TOKEN_STD);



	return 0;

	tokenid = brightness == LED_OFF ?

			GLOBAL_MIC_MUTE_DISABLE : GLOBAL_MIC_MUTE_ENABLE;

	return dell_set_std_token_value(&buffer, tokenid, USE_TVAL);

}



static struct led_classdev micmute_led_cdev = {
@@ -2201,21 +2162,11 @@ static int mute_led_set(struct led_classdev *led_cdev, 
			   enum led_brightness brightness)

{

	struct calling_interface_buffer buffer;

	struct calling_interface_token *token;

	int state = brightness != LED_OFF;



	if (state == 0)

		token = dell_smbios_find_token(GLOBAL_MUTE_DISABLE);

	else

		token = dell_smbios_find_token(GLOBAL_MUTE_ENABLE);



	if (!token)

		return -ENODEV;

	u32 tokenid;



	dell_fill_request(&buffer, token->location, token->value, 0, 0);

	dell_send_request(&buffer, CLASS_TOKEN_WRITE, SELECT_TOKEN_STD);



	return 0;

	tokenid = brightness == LED_OFF ?

			GLOBAL_MUTE_DISABLE : GLOBAL_MUTE_ENABLE;

	return dell_set_std_token_value(&buffer, tokenid, USE_TVAL);

}



static struct led_classdev mute_led_cdev = {
@@ -2492,7 +2443,7 @@ static void dell_battery_exit(void) 


static int __init dell_init(void)

{

	struct calling_interface_token *token;

	struct calling_interface_buffer buffer;

	int max_intensity = 0;

	int ret;
@@ -2554,16 +2505,10 @@ static int __init dell_init(void) 
	if (acpi_video_get_backlight_type() != acpi_backlight_vendor)

		return 0;



	token = dell_smbios_find_token(BRIGHTNESS_TOKEN);

	if (token) {

		struct calling_interface_buffer buffer;



		dell_fill_request(&buffer, token->location, 0, 0, 0);

		ret = dell_send_request(&buffer,

					CLASS_TOKEN_READ, SELECT_TOKEN_AC);

	ret = dell_send_request_for_tokenid(&buffer, CLASS_TOKEN_READ,

			SELECT_TOKEN_AC, BRIGHTNESS_TOKEN, 0);

	if (ret == 0)

		max_intensity = buffer.output[3];

	}



	if (max_intensity) {

		struct backlight_properties props;