diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-22 12:00:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-22 12:00:15 +0200 |
| commit | 1af824f085e813e06548212b18bbc788b16f60e6 (patch) | |
| tree | 7e4bea76e0780330e27d660633ba514dc02e2fbf /drivers/input/rmi4/rmi_f01.c | |
| parent | arch_topology: Get rid of cap_parsing_done (diff) | |
| parent | Input: axp20x-pek - switch to using devm_device_add_group() (diff) | |
| download | linux-dev-1af824f085e813e06548212b18bbc788b16f60e6.tar.xz linux-dev-1af824f085e813e06548212b18bbc788b16f60e6.zip | |
Merge branch 'bind_unbind' into driver-core-next
This merges the bind_unbind driver core feature into the
driver-core-next branch. bind_unbind is a branch so that others can
pull and work off of it safely.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/input/rmi4/rmi_f01.c')
| -rw-r--r-- | drivers/input/rmi4/rmi_f01.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c index 7f7e9176f7ea..6dca3c0fbb4a 100644 --- a/drivers/input/rmi4/rmi_f01.c +++ b/drivers/input/rmi4/rmi_f01.c @@ -570,18 +570,14 @@ static int rmi_f01_probe(struct rmi_function *fn) dev_set_drvdata(&fn->dev, f01); - error = sysfs_create_group(&fn->rmi_dev->dev.kobj, &rmi_f01_attr_group); + error = devm_device_add_group(&fn->rmi_dev->dev, &rmi_f01_attr_group); if (error) - dev_warn(&fn->dev, "Failed to create sysfs group: %d\n", error); + dev_warn(&fn->dev, + "Failed to create attribute group: %d\n", error); return 0; } -static void rmi_f01_remove(struct rmi_function *fn) -{ - sysfs_remove_group(&fn->rmi_dev->dev.kobj, &rmi_f01_attr_group); -} - static int rmi_f01_config(struct rmi_function *fn) { struct f01_data *f01 = dev_get_drvdata(&fn->dev); @@ -721,7 +717,6 @@ struct rmi_function_handler rmi_f01_handler = { }, .func = 0x01, .probe = rmi_f01_probe, - .remove = rmi_f01_remove, .config = rmi_f01_config, .attention = rmi_f01_attention, .suspend = rmi_f01_suspend, |