platform/x86: wmi: Replace read_takes_no_args with a flags field
[ Upstream commit a90b38c586
]
Replace the wmi_block.read_takes_no_args bool field with
an unsigned long flags field, used together with test_bit()
and friends.
This is a preparation patch for fixing a driver->notify() vs ->probe()
race, which requires atomic flag handling.
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211128190031.405620-1-hdegoede@redhat.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
789382ce73
Коммит
4b53562319
|
@ -51,6 +51,10 @@ struct guid_block {
|
|||
u8 flags;
|
||||
};
|
||||
|
||||
enum { /* wmi_block flags */
|
||||
WMI_READ_TAKES_NO_ARGS,
|
||||
};
|
||||
|
||||
struct wmi_block {
|
||||
struct wmi_device dev;
|
||||
struct list_head list;
|
||||
|
@ -61,8 +65,7 @@ struct wmi_block {
|
|||
wmi_notify_handler handler;
|
||||
void *handler_data;
|
||||
u64 req_buf_size;
|
||||
|
||||
bool read_takes_no_args;
|
||||
unsigned long flags;
|
||||
};
|
||||
|
||||
|
||||
|
@ -325,7 +328,7 @@ static acpi_status __query_block(struct wmi_block *wblock, u8 instance,
|
|||
wq_params[0].type = ACPI_TYPE_INTEGER;
|
||||
wq_params[0].integer.value = instance;
|
||||
|
||||
if (instance == 0 && wblock->read_takes_no_args)
|
||||
if (instance == 0 && test_bit(WMI_READ_TAKES_NO_ARGS, &wblock->flags))
|
||||
input.count = 0;
|
||||
|
||||
/*
|
||||
|
@ -1087,7 +1090,7 @@ static int wmi_create_device(struct device *wmi_bus_dev,
|
|||
* laptops, WQxx may not be a method at all.)
|
||||
*/
|
||||
if (info->type != ACPI_TYPE_METHOD || info->param_count == 0)
|
||||
wblock->read_takes_no_args = true;
|
||||
set_bit(WMI_READ_TAKES_NO_ARGS, &wblock->flags);
|
||||
|
||||
kfree(info);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче