Commit 2f89e23b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

platform/x86: wmi: move dev_to_wblock() and dev_to_wdev to use container_of_const()

The driver core is changing to pass some pointers as const, so move the
dev_to_wdev() and dev_to_wblock() functions to use container_of_const()
to handle this change.

Both of these functions now properly keep the const-ness of the pointer
passed into it, while as before it could be lost.

Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Mark Gross <markgross@kernel.org>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230111113018.459199-10-gregkh@linuxfoundation.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b84d6d3b
...@@ -693,15 +693,8 @@ char *wmi_get_acpi_device_uid(const char *guid_string) ...@@ -693,15 +693,8 @@ char *wmi_get_acpi_device_uid(const char *guid_string)
} }
EXPORT_SYMBOL_GPL(wmi_get_acpi_device_uid); EXPORT_SYMBOL_GPL(wmi_get_acpi_device_uid);
static struct wmi_block *dev_to_wblock(struct device *dev) #define dev_to_wblock(__dev) container_of_const(__dev, struct wmi_block, dev.dev)
{ #define dev_to_wdev(__dev) container_of_const(__dev, struct wmi_device, dev)
return container_of(dev, struct wmi_block, dev.dev);
}
static struct wmi_device *dev_to_wdev(struct device *dev)
{
return container_of(dev, struct wmi_device, dev);
}
static inline struct wmi_driver *drv_to_wdrv(struct device_driver *drv) static inline struct wmi_driver *drv_to_wdrv(struct device_driver *drv)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment