WMI: use separate list head for storing wmi blocks
Do not abuse wmi_block structure to hold the head of list
of blocks, use separate list_head for that.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index f6e85c8..dc528ba 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -47,6 +47,7 @@
#define PREFIX "ACPI: WMI: "
static DEFINE_MUTEX(wmi_data_lock);
+static LIST_HEAD(wmi_block_list);
struct guid_block {
char guid[16];
@@ -70,7 +71,6 @@
struct device *dev;
};
-static struct wmi_block wmi_blocks;
/*
* If the GUID data block is marked as expensive, we must enable and
@@ -234,7 +234,7 @@
wmi_parse_guid(guid_string, tmp);
wmi_swap_bytes(tmp, guid_input);
- list_for_each(p, &wmi_blocks.list) {
+ list_for_each(p, &wmi_block_list) {
wblock = list_entry(p, struct wmi_block, list);
block = &wblock->gblock;
@@ -621,7 +621,7 @@
params[0].type = ACPI_TYPE_INTEGER;
params[0].integer.value = event;
- list_for_each(p, &wmi_blocks.list) {
+ list_for_each(p, &wmi_block_list) {
wblock = list_entry(p, struct wmi_block, list);
gblock = &wblock->gblock;
@@ -709,7 +709,7 @@
struct device *guid_dev;
/* Create devices for all the GUIDs */
- list_for_each(p, &wmi_blocks.list) {
+ list_for_each(p, &wmi_block_list) {
wblock = list_entry(p, struct wmi_block, list);
guid_dev = kzalloc(sizeof(struct device), GFP_KERNEL);
@@ -746,7 +746,7 @@
struct device *guid_dev;
/* Delete devices for all the GUIDs */
- list_for_each(p, &wmi_blocks.list) {
+ list_for_each(p, &wmi_block_list) {
wblock = list_entry(p, struct wmi_block, list);
guid_dev = wblock->dev;
@@ -785,7 +785,7 @@
struct wmi_block *wblock;
struct list_head *p;
- list_for_each(p, &wmi_blocks.list) {
+ list_for_each(p, &wmi_block_list) {
wblock = list_entry(p, struct wmi_block, list);
gblock = &wblock->gblock;
@@ -799,7 +799,7 @@
{
struct wmi_block *wblock, *next;
- list_for_each_entry_safe(wblock, next, &wmi_blocks.list, list) {
+ list_for_each_entry_safe(wblock, next, &wmi_block_list, list) {
list_del(&wblock->list);
kfree(wblock);
}
@@ -864,7 +864,7 @@
wblock->handler = wmi_notify_debug;
wmi_method_enable(wblock, 1);
}
- list_add_tail(&wblock->list, &wmi_blocks.list);
+ list_add_tail(&wblock->list, &wmi_block_list);
}
out_free_pointer:
@@ -927,7 +927,7 @@
struct list_head *p;
char guid_string[37];
- list_for_each(p, &wmi_blocks.list) {
+ list_for_each(p, &wmi_block_list) {
wblock = list_entry(p, struct wmi_block, list);
block = &wblock->gblock;
@@ -987,8 +987,6 @@
{
int result;
- INIT_LIST_HEAD(&wmi_blocks.list);
-
if (acpi_disabled)
return -ENODEV;