rtc: ep93xx: stop setting platform_data
Alexandre Belloni
maintainerPATCH 1/8 rtc: ep93xx: stop setting platform_data
Since commit 28dc5f803899 ("drivers/rtc/rtc-ep93xx.c: use dev_get_platdata()"), platform_data is not used directly, it is not necessary to set it anymore.
--- drivers/rtc/rtc-ep93xx.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)
drivers/rtc/rtc-ep93xx.c +3 -15
@@ -28,10 +28,6 @@#define EP93XX_RTC_SWCOMP_INT_MASK 0x0000ffff#define EP93XX_RTC_SWCOMP_INT_SHIFT 0 -/* -* struct device dev.platform_data is used to store our private data -* because struct rtc_device does not have a variable to hold it. -*/ struct ep93xx_rtc {void __iomem *mmio_base;struct rtc_device *rtc;
@@ -140,31 +136,23 @@ static int ep93xx_rtc_probe(struct platform_device *pdev)if (IS_ERR (ep93xx_rtc->mmio_base))return PTR_ERR (ep93xx_rtc->mmio_base); - pdev->dev.platform_data = ep93xx_rtc;platform_set_drvdata (pdev, ep93xx_rtc); ep93xx_rtc->rtc =devm_rtc_device_register (&pdev->dev, pdev->name, &ep93xx_rtc_ops,THIS_MODULE ); -if (IS_ERR (ep93xx_rtc->rtc)) { - err =PTR_ERR (ep93xx_rtc->rtc); - goto exit; - } +if (IS_ERR (ep93xx_rtc->rtc)) +return PTR_ERR (ep93xx_rtc->rtc); err =sysfs_create_group (&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);if (err) - goto exit; +return err;return 0 ; - -exit: - pdev->dev.platform_data =NULL ; -return err; }static int ep93xx_rtc_remove (struct platform_device *pdev) {sysfs_remove_group (&pdev->dev.kobj, &ep93xx_rtc_sysfs_files); - pdev->dev.platform_data =NULL ;return 0 ; }
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 2/8 rtc: ep93xx: convert to devm_rtc_allocate_device
This allows further improvement of the driver.
--- drivers/rtc/rtc-ep93xx.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/rtc/rtc-ep93xx.c +7 -2
@@ -138,11 +138,16 @@ static int ep93xx_rtc_probe(struct platform_device *pdev)platform_set_drvdata (pdev, ep93xx_rtc); - ep93xx_rtc->rtc =devm_rtc_device_register (&pdev->dev, - pdev->name, &ep93xx_rtc_ops,THIS_MODULE ); + ep93xx_rtc->rtc =devm_rtc_allocate_device (&pdev->dev);if (IS_ERR (ep93xx_rtc->rtc))return PTR_ERR (ep93xx_rtc->rtc); + ep93xx_rtc->rtc->ops = &ep93xx_rtc_ops; + + err =rtc_register_device (ep93xx_rtc->rtc); +if (err) +return err; + err =sysfs_create_group (&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);if (err)return err;
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 3/8 rtc: ep93xx: use rtc_add_group
In reply to Alexandre BelloniUse 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.
--- drivers/rtc/rtc-ep93xx.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
drivers/rtc/rtc-ep93xx.c +4 -16
@@ -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);
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 4/8 rtc: ep93xx: set range
In reply to Alexandre BelloniThe ep93xx RTC is a 32-bit seconds counter.
--- drivers/rtc/rtc-ep93xx.c | 1 + 1 file changed, 1 insertion(+)
drivers/rtc/rtc-ep93xx.c +1 -0
@@ -143,6 +143,7 @@ static int ep93xx_rtc_probe(struct platform_device *pdev)return PTR_ERR (ep93xx_rtc->rtc); ep93xx_rtc->rtc->ops = &ep93xx_rtc_ops; + ep93xx_rtc->rtc->range_max =U32_MAX ; err =rtc_add_group (ep93xx_rtc->rtc, &ep93xx_rtc_sysfs_files);if (err)
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 5/8 rtc: ep93xx: switch to rtc_time64_to_tm
In reply to Alexandre BelloniCall the 64bit version of rtc_time_to_tm now that the range is enforced by the core.
--- drivers/rtc/rtc-ep93xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-ep93xx.c +1 -1
@@ -59,7 +59,7 @@ static int ep93xx_rtc_read_time(struct device *dev, struct rtc_time *tm) time =readl (ep93xx_rtc->mmio_base +EP93XX_RTC_DATA ); -rtc_time_to_tm (time, tm); +rtc_time64_to_tm (time, tm);return 0 ; }
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 6/8 rtc: ep93xx: use .set_time
In reply to Alexandre BelloniUse .set_time instead of the deprecated .set_mmss.
--- drivers/rtc/rtc-ep93xx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/rtc/rtc-ep93xx.c +3 -2
@@ -63,9 +63,10 @@ static int ep93xx_rtc_read_time(struct device *dev, struct rtc_time *tm)return 0 ; } -static int ep93xx_rtc_set_mmss (struct device *dev,unsigned long secs) +static int ep93xx_rtc_set_time (struct device *dev,struct rtc_time *tm) {struct ep93xx_rtc *ep93xx_rtc =dev_get_platdata (dev); +unsigned long secs =rtc_tm_to_time64 (tm);writel (secs +1 , ep93xx_rtc->mmio_base +EP93XX_RTC_LOAD );return 0 ;
@@ -85,7 +86,7 @@ static int ep93xx_rtc_proc(struct device *dev, struct seq_file *seq)static const struct rtc_class_ops ep93xx_rtc_ops = { .read_time = ep93xx_rtc_read_time, - .set_mmss = ep93xx_rtc_set_mmss, + .set_time = ep93xx_rtc_set_time, .proc = ep93xx_rtc_proc, };
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 7/8 rtc: ep93xx: convert to SPDX identifier
In reply to Alexandre BelloniUse SPDX-License-Identifier instead of a verbose license text.
--- drivers/rtc/rtc-ep93xx.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/rtc/rtc-ep93xx.c +1 -4
@@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * A driver for the RTC embedded in the Cirrus Logic EP93XX processors * Copyright (c) 2006 Tower Technologies * * Author: Alessandro Zummo <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. */ #include <linux/module.h>
Signature · 1 line
2.20.1
Alexandre Belloni
maintainerPATCH 8/8 rtc: ep93xx: fix checkpatch issues
In reply to Alexandre BelloniFix sysfs attribute declaration as suggested by checkpatch.
--- drivers/rtc/rtc-ep93xx.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/rtc/rtc-ep93xx.c +9 -9
@@ -15,10 +15,10 @@#define EP93XX_RTC_DATA 0x000#define EP93XX_RTC_MATCH 0x004#define EP93XX_RTC_STATUS 0x008 -#define EP93XX_RTC_STATUS_INTR (1<<0) +#define EP93XX_RTC_STATUS_INTR BIT(0)#define EP93XX_RTC_LOAD 0x00C#define EP93XX_RTC_CONTROL 0x010 -#define EP93XX_RTC_CONTROL_MIE (1<<0) +#define EP93XX_RTC_CONTROL_MIE BIT(0)#define EP93XX_RTC_SWCOMP 0x108#define EP93XX_RTC_SWCOMP_DEL_MASK 0x001f0000#define EP93XX_RTC_SWCOMP_DEL_SHIFT 16
@@ -31,7 +31,7 @@ struct ep93xx_rtc { };static int ep93xx_rtc_get_swcomp (struct device *dev,unsigned short *preload, -unsigned short *delete) +unsigned short *delete) {struct ep93xx_rtc *ep93xx_rtc =dev_get_platdata (dev);unsigned long comp;
@@ -87,8 +87,8 @@ static const struct rtc_class_ops ep93xx_rtc_ops = { .proc = ep93xx_rtc_proc, }; -static ssize_t ep93xx_rtc_show_comp_preload (struct device *dev, -struct device_attribute *attr,char *buf) +static ssize_t comp_preload_show (struct device *dev, +struct device_attribute *attr,char *buf) {unsigned short preload;
@@ -96,10 +96,10 @@ static ssize_t ep93xx_rtc_show_comp_preload(struct device *dev,return sprintf (buf,"%d\n" , preload); } -static DEVICE_ATTR(comp_preload, S_IRUGO, ep93xx_rtc_show_comp_preload, NULL); +static DEVICE_ATTR_RO (comp_preload); -static ssize_t ep93xx_rtc_show_comp_delete (struct device *dev, -struct device_attribute *attr,char *buf) +static ssize_t comp_delete_show (struct device *dev, +struct device_attribute *attr,char *buf) {unsigned short delete;
@@ -107,7 +107,7 @@ static ssize_t ep93xx_rtc_show_comp_delete(struct device *dev,return sprintf (buf,"%d\n" , delete); } -static DEVICE_ATTR(comp_delete, S_IRUGO, ep93xx_rtc_show_comp_delete, NULL); +static DEVICE_ATTR_RO (comp_delete);static struct attribute *ep93xx_rtc_attrs[] = { &dev_attr_comp_preload.attr,
Signature · 1 line
2.20.1