Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 440c4983 authored by Mattias Jacobsson's avatar Mattias Jacobsson Committed by Andy Shevchenko
Browse files

platform/x86: wmi: add context argument to the probe function 



The struct wmi_device_id has a context pointer field, forward this
pointer as an argument to the probe function in struct wmi_driver.

Update existing users of the same probe function to accept this new
context argument.

Signed-off-by: default avatarMattias Jacobsson <2pi@mok.nu>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent a48e2338

drivers/platform/x86/dell-smbios-wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static long dell_smbios_wmi_filter(struct wmi_device *wdev, unsigned int cmd, 
	return ret;

}



static int dell_smbios_wmi_probe(struct wmi_device *wdev)

static int dell_smbios_wmi_probe(struct wmi_device *wdev, const void *context)

{

	struct wmi_driver *wdriver =

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

drivers/platform/x86/dell-wmi-descriptor.c

+2 −1
Original line number Diff line number Diff line
@@ -106,7 +106,8 @@ EXPORT_SYMBOL_GPL(dell_wmi_get_hotfix); 
 * WMI buffer length        12       4    <length>

 * WMI hotfix number        16       4    <hotfix>

 */

static int dell_wmi_descriptor_probe(struct wmi_device *wdev)

static int dell_wmi_descriptor_probe(struct wmi_device *wdev,

				     const void *context)

{

	union acpi_object *obj = NULL;

	struct descriptor_priv *priv;

drivers/platform/x86/dell-wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ static int dell_wmi_events_set_enabled(bool enable) 
	return dell_smbios_error(ret);

}



static int dell_wmi_probe(struct wmi_device *wdev)

static int dell_wmi_probe(struct wmi_device *wdev, const void *context)

{

	struct dell_wmi_priv *priv;

	int ret;

drivers/platform/x86/huawei-wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static int huawei_wmi_input_setup(struct wmi_device *wdev) 
	return input_register_device(priv->idev);

}



static int huawei_wmi_probe(struct wmi_device *wdev)

static int huawei_wmi_probe(struct wmi_device *wdev, const void *context)

{

	struct huawei_wmi_priv *priv;

	int err;

drivers/platform/x86/intel-wmi-thunderbolt.c

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ static const struct attribute_group tbt_attribute_group = { 
	.attrs = tbt_attrs,

};



static int intel_wmi_thunderbolt_probe(struct wmi_device *wdev)

static int intel_wmi_thunderbolt_probe(struct wmi_device *wdev,

				       const void *context)

{

	int ret;