Commit e7b2e334 authored by Barnabás Pőcze's avatar Barnabás Pőcze Committed by Hans de Goede
Browse files

platform/x86: wmi: introduce helper to convert driver to WMI driver 



Introduce a helper function which wraps the appropriate
`container_of()` macro invocation to convert
a `struct device_driver` to `struct wmi_driver`.

Signed-off-by: default avatarBarnabás Pőcze <pobrn@protonmail.com>
Link: https://lore.kernel.org/r/20210904175450.156801-27-pobrn@protonmail.com


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 736b48aa

drivers/platform/x86/wmi.c

+10 −12
Original line number Diff line number Diff line
@@ -673,6 +673,11 @@ 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)

{

	return container_of(drv, struct wmi_driver, driver);

}



/*

 * sysfs interface

 */
@@ -791,8 +796,7 @@ static void wmi_dev_release(struct device *dev) 


static int wmi_dev_match(struct device *dev, struct device_driver *driver)

{

	struct wmi_driver *wmi_driver =

		container_of(driver, struct wmi_driver, driver);

	struct wmi_driver *wmi_driver = drv_to_wdrv(driver);

	struct wmi_block *wblock = dev_to_wblock(dev);

	const struct wmi_device_id *id = wmi_driver->id_table;
@@ -889,8 +893,7 @@ static long wmi_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
	}



	/* let the driver do any filtering and do the call */

	wdriver = container_of(wblock->dev.dev.driver,

			       struct wmi_driver, driver);

	wdriver = drv_to_wdrv(wblock->dev.dev.driver);

	if (!try_module_get(wdriver->driver.owner)) {

		ret = -EBUSY;

		goto out_ioctl;
@@ -923,8 +926,7 @@ static const struct file_operations wmi_fops = { 
static int wmi_dev_probe(struct device *dev)

{

	struct wmi_block *wblock = dev_to_wblock(dev);

	struct wmi_driver *wdriver =

		container_of(dev->driver, struct wmi_driver, driver);

	struct wmi_driver *wdriver = drv_to_wdrv(dev->driver);

	int ret = 0;

	char *buf;
@@ -987,8 +989,7 @@ static int wmi_dev_probe(struct device *dev) 
static void wmi_dev_remove(struct device *dev)

{

	struct wmi_block *wblock = dev_to_wblock(dev);

	struct wmi_driver *wdriver =

		container_of(dev->driver, struct wmi_driver, driver);

	struct wmi_driver *wdriver = drv_to_wdrv(dev->driver);



	if (wdriver->filter_callback) {

		misc_deregister(&wblock->char_dev);
@@ -1290,15 +1291,12 @@ static void acpi_wmi_notify_handler(acpi_handle handle, u32 event, 


	/* If a driver is bound, then notify the driver. */

	if (wblock->dev.dev.driver) {

		struct wmi_driver *driver;

		struct wmi_driver *driver = drv_to_wdrv(wblock->dev.dev.driver);

		struct acpi_object_list input;

		union acpi_object params[1];

		struct acpi_buffer evdata = { ACPI_ALLOCATE_BUFFER, NULL };

		acpi_status status;



		driver = container_of(wblock->dev.dev.driver,

				      struct wmi_driver, driver);



		input.count = 1;

		input.pointer = params;

		params[0].type = ACPI_TYPE_INTEGER;