Skip to content

Commit 29bf77f

Browse files
committed
Merge tag 'arm-soc/for-6.16/drivers' of https://github.com/Broadcom/stblinux into soc/drivers
This pull request contains Broadcom SoC driver updates for 6.16, please pull the following: - Ovidiu updates the brcmstb_gisb driver to use the dev_groups instead of manually adding those * tag 'arm-soc/for-6.16/drivers' of https://github.com/Broadcom/stblinux: bus: brcmstb_gisb: use dev_groups to register attribute groups Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 7ebbb84 + 29f526e commit 29bf77f

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

drivers/bus/brcmstb_gisb.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -395,10 +395,7 @@ static struct attribute *gisb_arb_sysfs_attrs[] = {
395395
&dev_attr_gisb_arb_timeout.attr,
396396
NULL,
397397
};
398-
399-
static struct attribute_group gisb_arb_sysfs_attr_group = {
400-
.attrs = gisb_arb_sysfs_attrs,
401-
};
398+
ATTRIBUTE_GROUPS(gisb_arb_sysfs);
402399

403400
static const struct of_device_id brcmstb_gisb_arb_of_match[] = {
404401
{ .compatible = "brcm,gisb-arb", .data = gisb_offsets_bcm7445 },
@@ -490,10 +487,6 @@ static int __init brcmstb_gisb_arb_probe(struct platform_device *pdev)
490487
}
491488
}
492489

493-
err = sysfs_create_group(&pdev->dev.kobj, &gisb_arb_sysfs_attr_group);
494-
if (err)
495-
return err;
496-
497490
platform_set_drvdata(pdev, gdev);
498491

499492
list_add_tail(&gdev->next, &brcmstb_gisb_arb_device_list);
@@ -550,6 +543,7 @@ static struct platform_driver brcmstb_gisb_arb_driver = {
550543
.name = "brcm-gisb-arb",
551544
.of_match_table = brcmstb_gisb_arb_of_match,
552545
.pm = &brcmstb_gisb_arb_pm_ops,
546+
.dev_groups = gisb_arb_sysfs_groups,
553547
},
554548
};
555549

0 commit comments

Comments
 (0)