| Message ID | 20190731124349.4474-5-gregkh@linuxfoundation.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d99995a4f0f189731695efad4135daf04df53075 |
| Headers | show |
| Series | drivers, provide a way to add sysfs groups easily | expand |
On Wed, Jul 31, 2019 at 02:43:43PM +0200, Greg Kroah-Hartman wrote: > Platform drivers now have the option to have the platform core create > and remove any needed sysfs attribute files. So take advantage of that > and do not register "by hand" a sysfs group of attributes. > > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Florian Fainelli <f.fainelli@gmail.com> > Cc: linux-input@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Applied, thank you. > --- > drivers/input/misc/axp20x-pek.c | 15 +++------------ > 1 file changed, 3 insertions(+), 12 deletions(-) > > diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c > index debeeaeb8812..235925b28772 100644 > --- a/drivers/input/misc/axp20x-pek.c > +++ b/drivers/input/misc/axp20x-pek.c > @@ -195,15 +195,12 @@ DEVICE_ATTR(startup, 0644, axp20x_show_attr_startup, axp20x_store_attr_startup); > DEVICE_ATTR(shutdown, 0644, axp20x_show_attr_shutdown, > axp20x_store_attr_shutdown); > > -static struct attribute *axp20x_attributes[] = { > +static struct attribute *axp20x_attrs[] = { > &dev_attr_startup.attr, > &dev_attr_shutdown.attr, > NULL, > }; > - > -static const struct attribute_group axp20x_attribute_group = { > - .attrs = axp20x_attributes, > -}; > +ATTRIBUTE_GROUPS(axp20x); > > static irqreturn_t axp20x_pek_irq(int irq, void *pwr) > { > @@ -356,13 +353,6 @@ static int axp20x_pek_probe(struct platform_device *pdev) > > axp20x_pek->info = (struct axp20x_info *)match->driver_data; > > - error = devm_device_add_group(&pdev->dev, &axp20x_attribute_group); > - if (error) { > - dev_err(&pdev->dev, "Failed to create sysfs attributes: %d\n", > - error); > - return error; > - } > - > platform_set_drvdata(pdev, axp20x_pek); > > return 0; > @@ -411,6 +401,7 @@ static struct platform_driver axp20x_pek_driver = { > .driver = { > .name = "axp20x-pek", > .pm = &axp20x_pek_pm_ops, > + .dev_groups = axp20x_groups, > }, > }; > module_platform_driver(axp20x_pek_driver); > -- > 2.22.0 >
diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c index debeeaeb8812..235925b28772 100644 --- a/drivers/input/misc/axp20x-pek.c +++ b/drivers/input/misc/axp20x-pek.c @@ -195,15 +195,12 @@ DEVICE_ATTR(startup, 0644, axp20x_show_attr_startup, axp20x_store_attr_startup); DEVICE_ATTR(shutdown, 0644, axp20x_show_attr_shutdown, axp20x_store_attr_shutdown); -static struct attribute *axp20x_attributes[] = { +static struct attribute *axp20x_attrs[] = { &dev_attr_startup.attr, &dev_attr_shutdown.attr, NULL, }; - -static const struct attribute_group axp20x_attribute_group = { - .attrs = axp20x_attributes, -}; +ATTRIBUTE_GROUPS(axp20x); static irqreturn_t axp20x_pek_irq(int irq, void *pwr) { @@ -356,13 +353,6 @@ static int axp20x_pek_probe(struct platform_device *pdev) axp20x_pek->info = (struct axp20x_info *)match->driver_data; - error = devm_device_add_group(&pdev->dev, &axp20x_attribute_group); - if (error) { - dev_err(&pdev->dev, "Failed to create sysfs attributes: %d\n", - error); - return error; - } - platform_set_drvdata(pdev, axp20x_pek); return 0; @@ -411,6 +401,7 @@ static struct platform_driver axp20x_pek_driver = { .driver = { .name = "axp20x-pek", .pm = &axp20x_pek_pm_ops, + .dev_groups = axp20x_groups, }, }; module_platform_driver(axp20x_pek_driver);
Platform drivers now have the option to have the platform core create and remove any needed sysfs attribute files. So take advantage of that and do not register "by hand" a sysfs group of attributes. Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: linux-input@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/input/misc/axp20x-pek.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)