Input: tsc2004/5 - use device core to create driver-specific device attributes

Instead of creating driver-specific device attributes with
sysfs_create_group() have device core do this by setting up dev_groups
pointer in the driver structure.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20230729005133.1095051-21-dmitry.torokhov@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/touchscreen/tsc2004.c b/drivers/input/touchscreen/tsc2004.c
index b5e904c5b7c49e8d7e8d2a8ada90950aae58ef39..89c5248f66f6fcbcd6e410f009340f7cd94898e4 100644 (file)
--- a/drivers/input/touchscreen/tsc2004.c
+++ b/drivers/input/touchscreen/tsc2004.c
@@ -63,9 +63,10 @@ MODULE_DEVICE_TABLE(of, tsc2004_of_match);
 
 static struct i2c_driver tsc2004_driver = {
        .driver = {
-               .name   = "tsc2004",
-               .of_match_table = of_match_ptr(tsc2004_of_match),
-               .pm     = pm_sleep_ptr(&tsc200x_pm_ops),
+               .name           = "tsc2004",
+               .dev_groups     = tsc200x_groups,
+               .of_match_table = of_match_ptr(tsc2004_of_match),
+               .pm             = pm_sleep_ptr(&tsc200x_pm_ops),
        },
        .id_table       = tsc2004_idtable,
        .probe          = tsc2004_probe,

diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index b6dfbcfc8c19b21ef59fb5d0fed0256105171db5..1b40ce0ca1b9910c60a38cd207f8d9de5d16fc57 100644 (file)
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -79,9 +79,10 @@ MODULE_DEVICE_TABLE(of, tsc2005_of_match);
 
 static struct spi_driver tsc2005_driver = {
        .driver = {
-               .name   = "tsc2005",
-               .of_match_table = of_match_ptr(tsc2005_of_match),
-               .pm     = pm_sleep_ptr(&tsc200x_pm_ops),
+               .name           = "tsc2005",
+               .dev_groups     = tsc200x_groups,
+               .of_match_table = of_match_ptr(tsc2005_of_match),
+               .pm             = pm_sleep_ptr(&tsc200x_pm_ops),
        },
        .probe  = tsc2005_probe,
        .remove = tsc2005_remove,

diff --git a/drivers/input/touchscreen/tsc200x-core.c b/drivers/input/touchscreen/tsc200x-core.c
index b799f26fcf8facbb090105a7a57cf5949ab60d1c..a4c0e9db9bb94d0abb47aadc793d11838033e3c7 100644 (file)
--- a/drivers/input/touchscreen/tsc200x-core.c
+++ b/drivers/input/touchscreen/tsc200x-core.c
@@ -356,6 +356,12 @@ static const struct attribute_group tsc200x_attr_group = {
        .attrs          = tsc200x_attrs,
 };
 
+const struct attribute_group *tsc200x_groups[] = {
+       &tsc200x_attr_group,
+       NULL
+};
+EXPORT_SYMBOL_GPL(tsc200x_groups);
+
 static void tsc200x_esd_work(struct work_struct *work)
 {
        struct tsc200x *ts = container_of(work, struct tsc200x, esd_work.work);
@@ -553,25 +559,17 @@ int tsc200x_probe(struct device *dev, int irq, const struct input_id *tsc_id,
                return error;
 
        dev_set_drvdata(dev, ts);
-       error = sysfs_create_group(&dev->kobj, &tsc200x_attr_group);
-       if (error) {
-               dev_err(dev,
-                       "Failed to create sysfs attributes, err: %d\n", error);
-               goto disable_regulator;
-       }
 
        error = input_register_device(ts->idev);
        if (error) {
                dev_err(dev,
                        "Failed to register input device, err: %d\n", error);
-               goto err_remove_sysfs;
+               goto disable_regulator;
        }
 
        irq_set_irq_wake(irq, 1);
        return 0;
 
-err_remove_sysfs:
-       sysfs_remove_group(&dev->kobj, &tsc200x_attr_group);
 disable_regulator:
        regulator_disable(ts->vio);
        return error;
@@ -582,8 +580,6 @@ void tsc200x_remove(struct device *dev)
 {
        struct tsc200x *ts = dev_get_drvdata(dev);
 
-       sysfs_remove_group(&dev->kobj, &tsc200x_attr_group);
-
        regulator_disable(ts->vio);
 }
 EXPORT_SYMBOL_GPL(tsc200x_remove);

diff --git a/drivers/input/touchscreen/tsc200x-core.h b/drivers/input/touchscreen/tsc200x-core.h
index 4ded34425b21eef7bbbb8270eb22c1a2e7e823e6..37de91efd78ea3cae52bb785d52c8517e5a9b653 100644 (file)
--- a/drivers/input/touchscreen/tsc200x-core.h
+++ b/drivers/input/touchscreen/tsc200x-core.h
@@ -70,6 +70,7 @@
 
 extern const struct regmap_config tsc200x_regmap_config;
 extern const struct dev_pm_ops tsc200x_pm_ops;
+extern const struct attribute_group *tsc200x_groups[];
 
 int tsc200x_probe(struct device *dev, int irq, const struct input_id *tsc_id,
                  struct regmap *regmap,