]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Input: rohm_bu21023 - use managed devm_device_add_group
authorAndi Shyti <andi@etezian.org>
Fri, 29 Sep 2017 23:39:34 +0000 (16:39 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 29 Sep 2017 23:51:04 +0000 (16:51 -0700)
Commit 57b8ff070f98 ("driver core: add devm_device_add_group() and
friends") has added the managed version for creating sysfs group files.

Use devm_device_add_group instead of sysfs_create_group and remove the
action that cleans the sysfs file when exiting the driver.

Signed-off-by: Andi Shyti <andi@etezian.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/rohm_bu21023.c

index eeaf6ff035974c836668a0aaec55fb4bd0f05965..bda0500c9b5779ba250b7260b0d368f4462334aa 100644 (file)
@@ -1103,13 +1103,6 @@ static void rohm_ts_close(struct input_dev *input_dev)
        ts->initialized = false;
 }
 
-static void rohm_ts_remove_sysfs_group(void *_dev)
-{
-       struct device *dev = _dev;
-
-       sysfs_remove_group(&dev->kobj, &rohm_ts_attr_group);
-}
-
 static int rohm_bu21023_i2c_probe(struct i2c_client *client,
                                  const struct i2c_device_id *id)
 {
@@ -1180,20 +1173,12 @@ static int rohm_bu21023_i2c_probe(struct i2c_client *client,
                return error;
        }
 
-       error = sysfs_create_group(&dev->kobj, &rohm_ts_attr_group);
+       error = devm_device_add_group(dev, &rohm_ts_attr_group);
        if (error) {
                dev_err(dev, "failed to create sysfs group: %d\n", error);
                return error;
        }
 
-       error = devm_add_action(dev, rohm_ts_remove_sysfs_group, dev);
-       if (error) {
-               rohm_ts_remove_sysfs_group(dev);
-               dev_err(dev, "Failed to add sysfs cleanup action: %d\n",
-                       error);
-               return error;
-       }
-
        return error;
 }