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

Commit cb8a2562 authored by Barnabás Pőcze's avatar Barnabás Pőcze Committed by Greg Kroah-Hartman
Browse files

platform/x86: wmi: move variables 



[ Upstream commit f5431bf1e6781e876bdc8ae10fb1e7da6f1aa9b5 ]

Move some variables in order to keep them
in the narrowest possible scope.

Signed-off-by: default avatarBarnabás Pőcze <pobrn@protonmail.com>
Link: https://lore.kernel.org/r/20210904175450.156801-22-pobrn@protonmail.com


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Stable-dep-of: 028e6e204ace ("platform/x86: wmi: Break possible infinite loop when parsing GUID")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 669c488c

drivers/platform/x86/wmi.c

+4 −5
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ static const void *find_guid_context(struct wmi_block *wblock, 
				      struct wmi_driver *wdriver)

{

	const struct wmi_device_id *id;

	guid_t guid_input;



	if (wblock == NULL || wdriver == NULL)

		return NULL;
@@ -142,6 +141,8 @@ static const void *find_guid_context(struct wmi_block *wblock, 


	id = wdriver->id_table;

	while (*id->guid_string) {

		guid_t guid_input;



		if (guid_parse(id->guid_string, &guid_input))

			continue;

		if (guid_equal(&wblock->gblock.guid, &guid_input))
@@ -612,7 +613,6 @@ acpi_status wmi_get_event_data(u32 event, struct acpi_buffer *out) 
{

	struct acpi_object_list input;

	union acpi_object params[1];

	struct guid_block *gblock;

	struct wmi_block *wblock;



	input.count = 1;
@@ -621,7 +621,7 @@ acpi_status wmi_get_event_data(u32 event, struct acpi_buffer *out) 
	params[0].integer.value = event;



	list_for_each_entry(wblock, &wmi_block_list, list) {

		gblock = &wblock->gblock;

		struct guid_block *gblock = &wblock->gblock;



		if ((gblock->flags & ACPI_WMI_EVENT) &&

			(gblock->notify_id == event))
@@ -1278,12 +1278,11 @@ acpi_wmi_ec_space_handler(u32 function, acpi_physical_address address, 
static void acpi_wmi_notify_handler(acpi_handle handle, u32 event,

				    void *context)

{

	struct guid_block *block;

	struct wmi_block *wblock;

	bool found_it = false;



	list_for_each_entry(wblock, &wmi_block_list, list) {

		block = &wblock->gblock;

		struct guid_block *block = &wblock->gblock;



		if (wblock->acpi_device->handle == handle &&

		    (block->flags & ACPI_WMI_EVENT) &&