From: Greg Kroah-Hartman Date: Wed, 11 Jan 2023 11:30:11 +0000 (+0100) Subject: platform/x86: wmi: move dev_to_wblock() and dev_to_wdev to use container_of_const() X-Git-Tag: v6.3-rc1~106^2~75 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f89e23bc03e31b8e6f4994cdd954c0a7e35ca4a;p=thirdparty%2Flinux.git 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 Cc: Mark Gross Acked-by: Hans de Goede Link: https://lore.kernel.org/r/20230111113018.459199-10-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 5ffc00480aef6..46d1edc08f20a 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -693,15 +693,8 @@ char *wmi_get_acpi_device_uid(const char *guid_string) } EXPORT_SYMBOL_GPL(wmi_get_acpi_device_uid); -static struct wmi_block *dev_to_wblock(struct 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); -} +#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) static inline struct wmi_driver *drv_to_wdrv(struct device_driver *drv) {