platform/x86: wmi: move variables

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

Signed-off-by: Barnabás Pőcze <pobrn@protonmail.com>
Link: https://lore.kernel.org/r/20210904175450.156801-22-pobrn@protonmail.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 163969a..a008428 100644 (file)
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -136,13 +136,14 @@ static const void *find_guid_context(struct wmi_block *wblock,
                                      struct wmi_driver *wdriver)
 {
        const struct wmi_device_id *id;
-       guid_t guid_input;
 
        id = wdriver->id_table;
        if (!id)
                return NULL;
 
        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))
@@ -604,7 +605,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;
@@ -613,7 +613,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))
@@ -1264,12 +1264,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) &&