diff options
| author | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2019-04-19 10:00:00 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2019-04-19 22:37:16 +0200 |
| commit | 09cd030b54466bc7024977bdab9636a597f63c55 (patch) | |
| tree | 2b39713f581384455178564bf04c32fcadfbd57f | |
| parent | bac68b30d5375fccd42ffcb96d6ab13b51509608 (diff) | |
| download | linux-09cd030b54466bc7024977bdab9636a597f63c55.tar.bz2 | |
rtc: ep93xx: use rtc_add_group
Use rtc_add_group to add the sysfs group in a race free manner.
This has the side effect of moving the files to their proper location.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
| -rw-r--r-- | drivers/rtc/rtc-ep93xx.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c index f15391bc4597..27417b4a8095 100644 --- a/drivers/rtc/rtc-ep93xx.c +++ b/drivers/rtc/rtc-ep93xx.c @@ -94,7 +94,7 @@ static ssize_t ep93xx_rtc_show_comp_preload(struct device *dev, { unsigned short preload; - ep93xx_rtc_get_swcomp(dev, &preload, NULL); + ep93xx_rtc_get_swcomp(dev->parent, &preload, NULL); return sprintf(buf, "%d\n", preload); } @@ -105,7 +105,7 @@ static ssize_t ep93xx_rtc_show_comp_delete(struct device *dev, { unsigned short delete; - ep93xx_rtc_get_swcomp(dev, NULL, &delete); + ep93xx_rtc_get_swcomp(dev->parent, NULL, &delete); return sprintf(buf, "%d\n", delete); } @@ -144,22 +144,11 @@ static int ep93xx_rtc_probe(struct platform_device *pdev) ep93xx_rtc->rtc->ops = &ep93xx_rtc_ops; - err = rtc_register_device(ep93xx_rtc->rtc); + err = rtc_add_group(ep93xx_rtc->rtc, &ep93xx_rtc_sysfs_files); if (err) return err; - err = sysfs_create_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files); - if (err) - return err; - - return 0; -} - -static int ep93xx_rtc_remove(struct platform_device *pdev) -{ - sysfs_remove_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files); - - return 0; + return rtc_register_device(ep93xx_rtc->rtc); } static struct platform_driver ep93xx_rtc_driver = { @@ -167,7 +156,6 @@ static struct platform_driver ep93xx_rtc_driver = { .name = "ep93xx-rtc", }, .probe = ep93xx_rtc_probe, - .remove = ep93xx_rtc_remove, }; module_platform_driver(ep93xx_rtc_driver); |