On Fri, Jul 28, 2023 at 5:51 PM Dmitry Torokhov
<dmitry.torokhov@xxxxxxxxx> 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@xxxxxxxxx>
Reviewed-by: Guenter Roeck <groeck@xxxxxxxxxxxx>
> ---
> drivers/input/keyboard/cros_ec_keyb.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
> index e7ecfca838df..313b7a69dd69 100644
> --- a/drivers/input/keyboard/cros_ec_keyb.c
> +++ b/drivers/input/keyboard/cros_ec_keyb.c
> @@ -686,10 +686,11 @@ static umode_t cros_ec_keyb_attr_is_visible(struct kobject *kobj,
> return attr->mode;
> }
>
> -static const struct attribute_group cros_ec_keyb_attr_group = {
> +static const struct attribute_group cros_ec_keyb_group = {
> .is_visible = cros_ec_keyb_attr_is_visible,
> .attrs = cros_ec_keyb_attrs,
> };
> +__ATTRIBUTE_GROUPS(cros_ec_keyb);
>
> static int cros_ec_keyb_probe(struct platform_device *pdev)
> {
> @@ -730,12 +731,6 @@ static int cros_ec_keyb_probe(struct platform_device *pdev)
> return err;
> }
>
> - err = devm_device_add_group(dev, &cros_ec_keyb_attr_group);
> - if (err) {
> - dev_err(dev, "failed to create attributes: %d\n", err);
> - return err;
> - }
> -
> ckdev->notifier.notifier_call = cros_ec_keyb_work;
> err = blocking_notifier_chain_register(&ckdev->ec->event_notifier,
> &ckdev->notifier);
> @@ -782,6 +777,7 @@ static struct platform_driver cros_ec_keyb_driver = {
> .remove = cros_ec_keyb_remove,
> .driver = {
> .name = "cros-ec-keyb",
> + .dev_groups = cros_ec_keyb_groups,
> .of_match_table = of_match_ptr(cros_ec_keyb_of_match),
> .acpi_match_table = ACPI_PTR(cros_ec_keyb_acpi_match),
> .pm = pm_sleep_ptr(&cros_ec_keyb_pm_ops),
> --
> 2.41.0.487.g6d72f3e995-goog
>
