platform/x86: wmi: remove unnecessary argument

The GUID block is available for `wmi_create_device()`
through `wblock->gblock`. Use that consistently in
the function instead of using a mix of `gblock` and
`wblock->gblock`.

Signed-off-by: Barnabás Pőcze <pobrn@protonmail.com>
Link: https://lore.kernel.org/r/20210904175450.156801-8-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 97d46da..3154e68 100644 (file)
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -1028,7 +1028,6 @@ static const struct device_type wmi_type_data = {
 };
 
 static int wmi_create_device(struct device *wmi_bus_dev,
-                            const struct guid_block *gblock,
                             struct wmi_block *wblock,
                             struct acpi_device *device)
 {
@@ -1036,12 +1035,12 @@ static int wmi_create_device(struct device *wmi_bus_dev,
        char method[5];
        int result;
 
-       if (gblock->flags & ACPI_WMI_EVENT) {
+       if (wblock->gblock.flags & ACPI_WMI_EVENT) {
                wblock->dev.dev.type = &wmi_type_event;
                goto out_init;
        }
 
-       if (gblock->flags & ACPI_WMI_METHOD) {
+       if (wblock->gblock.flags & ACPI_WMI_METHOD) {
                wblock->dev.dev.type = &wmi_type_method;
                mutex_init(&wblock->char_mutex);
                goto out_init;
@@ -1091,7 +1090,7 @@ static int wmi_create_device(struct device *wmi_bus_dev,
        wblock->dev.dev.bus = &wmi_bus_type;
        wblock->dev.dev.parent = wmi_bus_dev;
 
-       dev_set_name(&wblock->dev.dev, "%pUL", gblock->guid);
+       dev_set_name(&wblock->dev.dev, "%pUL", wblock->gblock.guid);
 
        device_initialize(&wblock->dev.dev);
 
@@ -1183,7 +1182,7 @@ static int parse_wdg(struct device *wmi_bus_dev, struct acpi_device *device)
                wblock->acpi_device = device;
                wblock->gblock = gblock[i];
 
-               retval = wmi_create_device(wmi_bus_dev, &gblock[i], wblock, device);
+               retval = wmi_create_device(wmi_bus_dev, wblock, device);
                if (retval) {
                        kfree(wblock);
                        continue;