| Message ID | 20230729005133.1095051-15-dmitry.torokhov@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 2883d4e30bd7417eae570223a6db180af30e8fa7 |
| Headers | show |
| Series | [01/22] Input: cros_ec_keyb - use device core to create driver-specific device attributes | expand |
On Fri, Jul 28, 2023 at 05:51:24PM -0700, Dmitry Torokhov wrote: > Instead of creating driver-specific device attributes with > devm_device_add_group() have device core do this by setting up dev_groups > pointer in the driver structure. > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Reviewed-by: Jeff LaBundy <jeff@labundy.com> > --- > drivers/input/touchscreen/iqs5xx.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/input/touchscreen/iqs5xx.c b/drivers/input/touchscreen/iqs5xx.c > index b4768b66eb10..a3f4fb85bee5 100644 > --- a/drivers/input/touchscreen/iqs5xx.c > +++ b/drivers/input/touchscreen/iqs5xx.c > @@ -974,10 +974,11 @@ static umode_t iqs5xx_attr_is_visible(struct kobject *kobj, > return attr->mode; > } > > -static const struct attribute_group iqs5xx_attr_group = { > +static const struct attribute_group iqs5xx_group = { > .is_visible = iqs5xx_attr_is_visible, > .attrs = iqs5xx_attrs, > }; > +__ATTRIBUTE_GROUPS(iqs5xx); > > static int iqs5xx_suspend(struct device *dev) > { > @@ -1053,12 +1054,6 @@ static int iqs5xx_probe(struct i2c_client *client) > return error; > } > > - error = devm_device_add_group(&client->dev, &iqs5xx_attr_group); > - if (error) { > - dev_err(&client->dev, "Failed to add attributes: %d\n", error); > - return error; > - } > - > if (iqs5xx->input) { > error = input_register_device(iqs5xx->input); > if (error) > @@ -1089,6 +1084,7 @@ MODULE_DEVICE_TABLE(of, iqs5xx_of_match); > static struct i2c_driver iqs5xx_i2c_driver = { > .driver = { > .name = "iqs5xx", > + .dev_groups = iqs5xx_groups, > .of_match_table = iqs5xx_of_match, > .pm = pm_sleep_ptr(&iqs5xx_pm), > }, > -- > 2.41.0.487.g6d72f3e995-goog >
diff --git a/drivers/input/touchscreen/iqs5xx.c b/drivers/input/touchscreen/iqs5xx.c index b4768b66eb10..a3f4fb85bee5 100644 --- a/drivers/input/touchscreen/iqs5xx.c +++ b/drivers/input/touchscreen/iqs5xx.c @@ -974,10 +974,11 @@ static umode_t iqs5xx_attr_is_visible(struct kobject *kobj, return attr->mode; } -static const struct attribute_group iqs5xx_attr_group = { +static const struct attribute_group iqs5xx_group = { .is_visible = iqs5xx_attr_is_visible, .attrs = iqs5xx_attrs, }; +__ATTRIBUTE_GROUPS(iqs5xx); static int iqs5xx_suspend(struct device *dev) { @@ -1053,12 +1054,6 @@ static int iqs5xx_probe(struct i2c_client *client) return error; } - error = devm_device_add_group(&client->dev, &iqs5xx_attr_group); - if (error) { - dev_err(&client->dev, "Failed to add attributes: %d\n", error); - return error; - } - if (iqs5xx->input) { error = input_register_device(iqs5xx->input); if (error) @@ -1089,6 +1084,7 @@ MODULE_DEVICE_TABLE(of, iqs5xx_of_match); static struct i2c_driver iqs5xx_i2c_driver = { .driver = { .name = "iqs5xx", + .dev_groups = iqs5xx_groups, .of_match_table = iqs5xx_of_match, .pm = pm_sleep_ptr(&iqs5xx_pm), },
Instead of creating driver-specific device attributes with devm_device_add_group() have device core do this by setting up dev_groups pointer in the driver structure. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/touchscreen/iqs5xx.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)