Skip to content

Commit f97e058

Browse files
Mario Limonciellodvhart
authored andcommitted
platform/x86: wmi: Don't allow drivers to get each other's GUIDs
The only driver using this was dell-wmi, and it really was a hack. The driver was getting a data attribute from another driver and this type of action should not be encouraged. Rather drivers that need to interact with one another should pass data back and forth via exported functions. Signed-off-by: Mario Limonciello <[email protected]> Reviewed-by: Edward O'Callaghan <[email protected]> Reviewed-by: Pali Rohár <[email protected]> Signed-off-by: Darren Hart (VMware) <[email protected]>
1 parent 92b8c54 commit f97e058

File tree

2 files changed

+0
-21
lines changed

2 files changed

+0
-21
lines changed

drivers/platform/x86/wmi.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -368,23 +368,6 @@ union acpi_object *wmidev_block_query(struct wmi_device *wdev, u8 instance)
368368
}
369369
EXPORT_SYMBOL_GPL(wmidev_block_query);
370370

371-
struct wmi_device *wmidev_get_other_guid(struct wmi_device *wdev,
372-
const char *guid_string)
373-
{
374-
struct wmi_block *this_wb = container_of(wdev, struct wmi_block, dev);
375-
struct wmi_block *other_wb;
376-
377-
if (!find_guid(guid_string, &other_wb))
378-
return NULL;
379-
380-
if (other_wb->acpi_device != this_wb->acpi_device)
381-
return NULL;
382-
383-
get_device(&other_wb->dev.dev);
384-
return &other_wb->dev;
385-
}
386-
EXPORT_SYMBOL_GPL(wmidev_get_other_guid);
387-
388371
/**
389372
* wmi_set_block - Write to a WMI block
390373
* @guid_string: 36 char string of the form fa50ff2b-f2e8-45de-83fa-65417f2f49ba

include/linux/wmi.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ extern acpi_status wmidev_evaluate_method(struct wmi_device *wdev,
3636
extern union acpi_object *wmidev_block_query(struct wmi_device *wdev,
3737
u8 instance);
3838

39-
/* Gets another device on the same bus. Caller must put_device the result. */
40-
extern struct wmi_device *wmidev_get_other_guid(struct wmi_device *wdev,
41-
const char *guid_string);
42-
4339
struct wmi_device_id {
4440
const char *guid_string;
4541
};

0 commit comments

Comments
 (0)