openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Mattias Jacobsson <2pi@mok.nu>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
Mattias Jacobsson 2019-05-27 18:21:30 +02:00 committed by Andy Shevchenko
parent a48e23385f
commit 440c4983de
8 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/platform/x86/dell-smbios-wmi.c
View File

@ -146,7 +146,7 @@ static long dell_smbios_wmi_filter(struct wmi_device *wdev, unsigned int cmd,
return ret; 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 = struct wmi_driver *wdriver =
container_of(wdev->dev.driver, struct wmi_driver, driver); container_of(wdev->dev.driver, struct wmi_driver, driver);

3
drivers/platform/x86/dell-wmi-descriptor.c
View File

@ -106,7 +106,8 @@ EXPORT_SYMBOL_GPL(dell_wmi_get_hotfix);
* WMI buffer length 12 4 <length> * WMI buffer length 12 4 <length>
* WMI hotfix number 16 4 <hotfix> * 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; union acpi_object *obj = NULL;
struct descriptor_priv *priv; struct descriptor_priv *priv;

2
drivers/platform/x86/dell-wmi.c
View File

@ -672,7 +672,7 @@ static int dell_wmi_events_set_enabled(bool enable)
return dell_smbios_error(ret); 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; struct dell_wmi_priv *priv;
int ret; int ret;

2
drivers/platform/x86/huawei-wmi.c
View File

@ -166,7 +166,7 @@ static int huawei_wmi_input_setup(struct wmi_device *wdev)
return input_register_device(priv->idev); 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; struct huawei_wmi_priv *priv;
int err; int err;

3
drivers/platform/x86/intel-wmi-thunderbolt.c
View File

@ -56,7 +56,8 @@ static const struct attribute_group tbt_attribute_group = {
.attrs = tbt_attrs, .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; int ret;

2
drivers/platform/x86/wmi-bmof.c
View File

@ -54,7 +54,7 @@ read_bmof(struct file *filp, struct kobject *kobj,
return count; return count;
} }
static int wmi_bmof_probe(struct wmi_device *wdev) static int wmi_bmof_probe(struct wmi_device *wdev, const void *context)
{ {
struct bmof_priv *priv; struct bmof_priv *priv;
int ret; int ret;

3
drivers/platform/x86/wmi.c
View File

@ -945,7 +945,8 @@ static int wmi_dev_probe(struct device *dev)
dev_warn(dev, "failed to enable device -- probing anyway\n"); dev_warn(dev, "failed to enable device -- probing anyway\n");
if (wdriver->probe) { if (wdriver->probe) {
ret = wdriver->probe(dev_to_wdev(dev)); ret = wdriver->probe(dev_to_wdev(dev),
find_guid_context(wblock, wdriver));
if (ret != 0) if (ret != 0)
goto probe_failure; goto probe_failure;
} }

2
include/linux/wmi.h
View File

@ -44,7 +44,7 @@ struct wmi_driver {
struct device_driver driver; struct device_driver driver;
const struct wmi_device_id *id_table; const struct wmi_device_id *id_table;
int (*probe)(struct wmi_device *wdev); int (*probe)(struct wmi_device *wdev, const void *context);
int (*remove)(struct wmi_device *wdev); int (*remove)(struct wmi_device *wdev);
void (*notify)(struct wmi_device *device, union acpi_object *data); void (*notify)(struct wmi_device *device, union acpi_object *data);
long (*filter_callback)(struct wmi_device *wdev, unsigned int cmd, long (*filter_callback)(struct wmi_device *wdev, unsigned int cmd,