rtc: ds1685: drop RTC_DS1685_PROC_REGS
Alexandre Belloni
maintainerPATCH 1/3 rtc: ds1685: drop RTC_DS1685_PROC_REGS
/proc is not the correct ABI to display debugging info. Remove RTC_DS1685_PROC_REGS as the driver hasn't seen any real development since it was included.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/Kconfig | 11 -------- drivers/rtc/rtc-ds1685.c | 61 ---------------------------------------- 2 files changed, 72 deletions(-)
drivers/rtc/Kconfig +0 -11
@@ -1008,17 +1008,6 @@ config RTC_DRV_DS17885 endchoice -config RTC_DS1685_PROC_REGS - bool "Display register values in /proc" - depends on RTC_DRV_DS1685_FAMILY && PROC_FS - help - Enable this to display a readout of all of the RTC registers in - /proc/drivers/rtc. Keep in mind that this can potentially lead - to lost interrupts, as reading Control Register C will clear - all pending IRQ flags. - - Unless you are debugging this driver, choose N. - config RTC_DRV_DS1742 tristate "Maxim/Dallas DS1742/1743" depends on HAS_IOMEM
drivers/rtc/rtc-ds1685.c +0 -61
87 lines not on this page · raw message
Signature · 1 line
2.19.0
Alexandre Belloni
maintainerPATCH 2/3 rtc: ds1685: use generic nvmem
Instead of adding a binary sysfs attribute from the driver, use the core to register an nvmem device.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-ds1685.c | 92 +++++++++++----------------------------- 1 file changed, 25 insertions(+), 67 deletions(-)
drivers/rtc/rtc-ds1685.c +25 -67
@@ -866,30 +866,13 @@ ds1685_rtc_ops = { };/* ----------------------------------------------------------------------- */ - -/* ----------------------------------------------------------------------- */ -/* SysFS interface */ - -#ifdef CONFIG_SYSFS -/** -* ds1685_rtc_sysfs_nvram_read - reads rtc nvram via sysfs. -* @file: pointer to file structure. -* @kobj: pointer to kobject structure. -* @bin_attr: pointer to bin_attribute structure. -* @buf: pointer to char array to hold the output. -* @pos: current file position pointer. -* @size: size of the data to read. -*/ -static ssize_t -ds1685_rtc_sysfs_nvram_read (struct file *filp,struct kobject *kobj, -struct bin_attribute *bin_attr,char *buf, -loff_t pos,size_t size) +static int ds1685_nvram_read (void *priv,unsigned int pos,void *val, +size_t size) { -struct platform_device *pdev = - to_platform_device(container_of(kobj, struct device, kobj)); -struct ds1685_priv *rtc =platform_get_drvdata (pdev); +struct ds1685_priv *rtc = priv;ssize_t count;unsigned long flags =0 ; +u8 *buf = val;spin_lock_irqsave (&rtc->lock, flags);ds1685_rtc_switch_to_bank0 (rtc);
@@ -943,33 +926,16 @@ ds1685_rtc_sysfs_nvram_read(struct file *filp, struct kobject *kobj,#endif /* !CONFIG_RTC_DRV_DS1689 */ spin_unlock_irqrestore (&rtc->lock, flags); -/* -* XXX: Bug? this appears to cause the function to get executed -* several times in succession. But it's the only way to actually get -* data written out to a file. -*/ -return count; +return 0 ; } -/** -* ds1685_rtc_sysfs_nvram_write - writes rtc nvram via sysfs. -* @file: pointer to file structure. -* @kobj: pointer to kobject structure. -* @bin_attr: pointer to bin_attribute structure. -* @buf: pointer to char array to hold the input. -* @pos: current file position pointer. -* @size: size of the data to write. -*/ -static ssize_t -ds1685_rtc_sysfs_nvram_write (struct file *filp,struct kobject *kobj, -struct bin_attribute *bin_attr,char *buf, -loff_t pos,size_t size) +static int ds1685_nvram_write (void *priv,unsigned int pos,void *val, +size_t size) { -struct platform_device *pdev = - to_platform_device(container_of(kobj, struct device, kobj)); -struct ds1685_priv *rtc =platform_get_drvdata (pdev); +struct ds1685_priv *rtc = priv;ssize_t count;unsigned long flags =0 ; +u8 *buf = val;spin_lock_irqsave (&rtc->lock, flags);ds1685_rtc_switch_to_bank0 (rtc);
@@ -1023,27 +989,13 @@ ds1685_rtc_sysfs_nvram_write(struct file *filp, struct kobject *kobj,#endif /* !CONFIG_RTC_DRV_DS1689 */ spin_unlock_irqrestore (&rtc->lock, flags); -return count; +return 0 ; } -/** -* struct ds1685_rtc_sysfs_nvram_attr - sysfs attributes for rtc nvram. -* @attr: nvram attributes. -* @read: nvram read function. -* @write: nvram write function. -* @size: nvram total size (bank0 + extended). -*/ -static struct bin_attribute -ds1685_rtc_sysfs_nvram_attr = { - .attr = { - .name ="nvram" , - .mode =S_IRUGO |S_IWUSR , - }, - .read = ds1685_rtc_sysfs_nvram_read, - .write = ds1685_rtc_sysfs_nvram_write, - .size =NVRAM_TOTAL_SZ -}; +/* ----------------------------------------------------------------------- */ +/* SysFS interface */ +#ifdef CONFIG_SYSFS /** * ds1685_rtc_sysfs_battery_show - sysfs file for main battery status. * @dev: pointer to device structure.
@@ -1136,11 +1088,6 @@ ds1685_rtc_sysfs_register(struct device *dev) {int ret =0 ; -sysfs_bin_attr_init (&ds1685_rtc_sysfs_nvram_attr); - ret =sysfs_create_bin_file (&dev->kobj, &ds1685_rtc_sysfs_nvram_attr); -if (ret) -return ret; - ret =sysfs_create_group (&dev->kobj, &ds1685_rtc_sysfs_misc_grp);if (ret)return ret;
@@ -1155,7 +1102,6 @@ ds1685_rtc_sysfs_register(struct device *dev)static int ds1685_rtc_sysfs_unregister (struct device *dev) { -sysfs_remove_bin_file (&dev->kobj, &ds1685_rtc_sysfs_nvram_attr);sysfs_remove_group (&dev->kobj, &ds1685_rtc_sysfs_misc_grp);return 0 ;
@@ -1181,6 +1127,12 @@ ds1685_rtc_probe(struct platform_device *pdev)u8 ctrla, ctrlb, hours;unsigned char am_pm;int ret =0 ; +struct nvmem_config nvmem_cfg = { + .name ="ds1685_nvram" , + .size =NVRAM_TOTAL_SZ , + .reg_read = ds1685_nvram_read, + .reg_write = ds1685_nvram_write, + };/* Get the platform data. */ pdata = (struct ds1685_rtc_platform_data *) pdev->dev.platform_data;
@@ -1444,6 +1396,12 @@ ds1685_rtc_probe(struct platform_device *pdev)return ret;#endif + rtc_dev->nvram_old_abi = true; + nvmem_cfg.priv = rtc; + ret =rtc_nvmem_register (rtc_dev, &nvmem_cfg); +if (ret) +return ret; +return rtc_register_device (rtc_dev); }
Signature · 1 line
2.19.0
Alexandre Belloni
maintainerPATCH 3/3 rtc: ds1685: use rtc_add_group
In reply to Alexandre BelloniUse rtc_add_group to add the sysfs group in a race free manner.
Signed-off-by Alexandre Belloni <[email protected]>
--- drivers/rtc/rtc-ds1685.c | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-)
drivers/rtc/rtc-ds1685.c +1 -39
@@ -995,7 +995,6 @@ static int ds1685_nvram_write(void *priv, unsigned int pos, void *val,/* ----------------------------------------------------------------------- */ /* SysFS interface */ -#ifdef CONFIG_SYSFS /** * ds1685_rtc_sysfs_battery_show - sysfs file for main battery status. * @dev: pointer to device structure.
@@ -1079,37 +1078,6 @@ ds1685_rtc_sysfs_misc_grp = { .attrs = ds1685_rtc_sysfs_misc_attrs, }; -/** -* ds1685_rtc_sysfs_register - register sysfs files. -* @dev: pointer to device structure. -*/ -static int -ds1685_rtc_sysfs_register (struct device *dev) -{ -int ret =0 ; - - ret =sysfs_create_group (&dev->kobj, &ds1685_rtc_sysfs_misc_grp); -if (ret) -return ret; - -return 0 ; -} - -/** -* ds1685_rtc_sysfs_unregister - unregister sysfs files. -* @dev: pointer to device structure. -*/ -static int -ds1685_rtc_sysfs_unregister (struct device *dev) -{ -sysfs_remove_group (&dev->kobj, &ds1685_rtc_sysfs_misc_grp); - -return 0 ; -} -#endif /* CONFIG_SYSFS */ - - -/* ----------------------------------------------------------------------- */ /* Driver Probe/Removal */
@@ -1390,11 +1358,9 @@ ds1685_rtc_probe(struct platform_device *pdev)/* Setup complete. */ ds1685_rtc_switch_to_bank0 (rtc); -#ifdef CONFIG_SYSFS - ret =ds1685_rtc_sysfs_register (&pdev->dev); + ret =rtc_add_group (rtc_dev, &ds1685_rtc_sysfs_misc_grp);if (ret)return ret; -#endif rtc_dev->nvram_old_abi = true; nvmem_cfg.priv = rtc;
@@ -1414,10 +1380,6 @@ ds1685_rtc_remove(struct platform_device *pdev) {struct ds1685_priv *rtc =platform_get_drvdata (pdev); -#ifdef CONFIG_SYSFS -ds1685_rtc_sysfs_unregister (&pdev->dev); -#endif -/* Read Ctrl B and clear PIE/AIE/UIE. */ rtc->write(rtc, RTC_CTRL_B, (rtc->read(rtc, RTC_CTRL_B) &
Signature · 1 line
2.19.0