Commit 99ce461c authored by Hans de Goede's avatar Hans de Goede
Browse files

platform/x86: thinkpad_acpi: Drop tpacpi_input_send_key_masked() and hotkey_driver_event() 



Both are only 1 / 2 lines and both only have 1 caller fold the contents
into tpacpi_hotkey_send_key() which is their single caller.

Tested-by: default avatarMark Pearson <mpearson-lenovo@squebb.ca>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarMark Pearson <mpearson-lenovo@squebb.ca>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20240424122834.19801-13-hdegoede@redhat.com
parent 4a3725d7

drivers/platform/x86/thinkpad_acpi.c

+2 −14
Original line number Diff line number Diff line
@@ -1919,7 +1919,6 @@ static u32 hotkey_acpi_mask; /* events enabled in firmware */ 
static u16 *hotkey_keycode_map;



static bool tpacpi_driver_event(const unsigned int hkey_event);

static void hotkey_driver_event(const unsigned int scancode);

static void hotkey_poll_setup(const bool may_warn);



/* HKEY.MHKG() return bits */
@@ -2275,20 +2274,14 @@ static void tpacpi_input_send_key(const unsigned int scancode) 
	}

}



/* Do NOT call without validating scancode first */

static void tpacpi_input_send_key_masked(const unsigned int scancode)

{

	hotkey_driver_event(scancode);

	tpacpi_input_send_key(scancode);

}



#ifdef CONFIG_THINKPAD_ACPI_HOTKEY_POLL

static struct tp_acpi_drv_struct ibm_hotkey_acpidriver;



/* Do NOT call without validating scancode first */

static void tpacpi_hotkey_send_key(unsigned int scancode)

{

	tpacpi_input_send_key_masked(scancode);

	tpacpi_driver_event(TP_HKEY_EV_ORIG_KEY_START + scancode);

	tpacpi_input_send_key(scancode);

}



static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
@@ -11168,11 +11161,6 @@ static bool tpacpi_driver_event(const unsigned int hkey_event) 
	return false;

}



static void hotkey_driver_event(const unsigned int scancode)

{

	tpacpi_driver_event(TP_HKEY_EV_ORIG_KEY_START + scancode);

}



/* --------------------------------------------------------------------- */



/* /proc support */