diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rtc/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/rtc/Makefile | 2 | ||||
| -rw-r--r-- | drivers/rtc/class.c | 3 | ||||
| -rw-r--r-- | drivers/rtc/rtc-core.h | 14 | ||||
| -rw-r--r-- | drivers/rtc/rtc-sysfs.c | 87 |
5 files changed, 42 insertions, 66 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 48eca80bbfc4..d738725d4a1d 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -48,7 +48,7 @@ comment "RTC interfaces" depends on RTC_CLASS config RTC_INTF_SYSFS - tristate "sysfs" + boolean "sysfs" depends on RTC_CLASS && SYSFS default RTC_CLASS help diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 4820dcc6a8fa..37bb9ceba277 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -12,8 +12,8 @@ obj-$(CONFIG_RTC_CLASS) += rtc-core.o rtc-core-y := class.o interface.o rtc-core-$(CONFIG_RTC_INTF_DEV) += rtc-dev.o +rtc-core-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o -obj-$(CONFIG_RTC_INTF_SYSFS) += rtc-sysfs.o obj-$(CONFIG_RTC_INTF_PROC) += rtc-proc.o obj-$(CONFIG_RTC_DRV_CMOS) += rtc-cmos.o diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index 786406c2cf78..5845e6e9b579 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c @@ -89,6 +89,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev, goto exit_kfree; rtc_dev_add_device(rtc); + rtc_sysfs_add_device(rtc); dev_info(dev, "rtc core: registered %s as %s\n", rtc->name, rtc->class_dev.class_id); @@ -123,6 +124,7 @@ void rtc_device_unregister(struct rtc_device *rtc) /* remove innards of this RTC, then disable it, before * letting any rtc_class_open() users access it again */ + rtc_sysfs_del_device(rtc); rtc_dev_del_device(rtc); class_device_unregister(&rtc->class_dev); rtc->ops = NULL; @@ -147,6 +149,7 @@ static int __init rtc_init(void) return PTR_ERR(rtc_class); } rtc_dev_init(); + rtc_sysfs_init(rtc_class); return 0; } diff --git a/drivers/rtc/rtc-core.h b/drivers/rtc/rtc-core.h index c9891423a468..30bcd14377c5 100644 --- a/drivers/rtc/rtc-core.h +++ b/drivers/rtc/rtc-core.h @@ -15,3 +15,17 @@ extern void rtc_dev_del_device(struct rtc_device *rtc); #define rtc_dev_del_device(r) do{}while(0) #endif + +#ifdef CONFIG_RTC_INTF_SYSFS + +extern void __init rtc_sysfs_init(struct class *); +extern void rtc_sysfs_add_device(struct rtc_device *rtc); +extern void rtc_sysfs_del_device(struct rtc_device *rtc); + +#else + +#define rtc_sysfs_init(c) do{}while(0) +#define rtc_sysfs_add_device(r) do{}while(0) +#define rtc_sysfs_del_device(r) do{}while(0) + +#endif diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c index 97444b45cc26..1c2fa0cc9cbb 100644 --- a/drivers/rtc/rtc-sysfs.c +++ b/drivers/rtc/rtc-sysfs.c @@ -21,7 +21,6 @@ static ssize_t rtc_sysfs_show_name(struct class_device *dev, char *buf) { return sprintf(buf, "%s\n", to_rtc_device(dev)->name); } -static CLASS_DEVICE_ATTR(name, S_IRUGO, rtc_sysfs_show_name, NULL); static ssize_t rtc_sysfs_show_date(struct class_device *dev, char *buf) { @@ -36,7 +35,6 @@ static ssize_t rtc_sysfs_show_date(struct class_device *dev, char *buf) return retval; } -static CLASS_DEVICE_ATTR(date, S_IRUGO, rtc_sysfs_show_date, NULL); static ssize_t rtc_sysfs_show_time(struct class_device *dev, char *buf) { @@ -51,7 +49,6 @@ static ssize_t rtc_sysfs_show_time(struct class_device *dev, char *buf) return retval; } -static CLASS_DEVICE_ATTR(time, S_IRUGO, rtc_sysfs_show_time, NULL); static ssize_t rtc_sysfs_show_since_epoch(struct class_device *dev, char *buf) { @@ -67,21 +64,15 @@ static ssize_t rtc_sysfs_show_since_epoch(struct class_device *dev, char *buf) return retval; } -static CLASS_DEVICE_ATTR(since_epoch, S_IRUGO, rtc_sysfs_show_since_epoch, NULL); - -static struct attribute *rtc_attrs[] = { - &class_device_attr_name.attr, - &class_device_attr_date.attr, - &class_device_attr_time.attr, - &class_device_attr_since_epoch.attr, - NULL, -}; -static struct attribute_group rtc_attr_group = { - .attrs = rtc_attrs, +static struct class_device_attribute rtc_attrs[] = { + __ATTR(name, S_IRUGO, rtc_sysfs_show_name, NULL), + __ATTR(date, S_IRUGO, rtc_sysfs_show_date, NULL), + __ATTR(time, S_IRUGO, rtc_sysfs_show_time, NULL), + __ATTR(since_epoch, S_IRUGO, rtc_sysfs_show_since_epoch, NULL), + { }, }; - static ssize_t rtc_sysfs_show_wakealarm(struct class_device *dev, char *buf) { @@ -157,71 +148,39 @@ static const CLASS_DEVICE_ATTR(wakealarm, S_IRUGO | S_IWUSR, * suspend-to-disk. So: no attribute unless that side effect is possible. * (Userspace may disable that mechanism later.) */ -static inline int rtc_does_wakealarm(struct class_device *class_dev) +static inline int rtc_does_wakealarm(struct rtc_device *rtc) { - struct rtc_device *rtc; - - if (!device_can_wakeup(class_dev->dev)) + if (!device_can_wakeup(rtc->class_dev.dev)) return 0; - rtc = to_rtc_device(class_dev); return rtc->ops->set_alarm != NULL; } -static int rtc_sysfs_add_device(struct class_device *class_dev, - struct class_interface *class_intf) +void rtc_sysfs_add_device(struct rtc_device *rtc) { int err; - dev_dbg(class_dev->dev, "rtc intf: sysfs\n"); + /* not all RTCs support both alarms and wakeup */ + if (!rtc_does_wakealarm(rtc)) + return; - err = sysfs_create_group(&class_dev->kobj, &rtc_attr_group); + err = class_device_create_file(&rtc->class_dev, + &class_device_attr_wakealarm); if (err) - dev_err(class_dev->dev, "failed to create %s\n", - "sysfs attributes"); - else if (rtc_does_wakealarm(class_dev)) { - /* not all RTCs support both alarms and wakeup */ - err = class_device_create_file(class_dev, - &class_device_attr_wakealarm); - if (err) { - dev_err(class_dev->dev, "failed to create %s\n", - "alarm attribute"); - sysfs_remove_group(&class_dev->kobj, &rtc_attr_group); - } - } - - return err; + dev_err(rtc->class_dev.dev, "failed to create " + "alarm attribute, %d", + err); } -static void rtc_sysfs_remove_device(struct class_device *class_dev, - struct class_interface *class_intf) +void rtc_sysfs_del_device(struct rtc_device *rtc) { - if (rtc_does_wakealarm(class_dev)) - class_device_remove_file(class_dev, + /* REVISIT did we add it successfully? */ + if (rtc_does_wakealarm(rtc)) + class_device_remove_file(&rtc->class_dev, &class_device_attr_wakealarm); - sysfs_remove_group(&class_dev->kobj, &rtc_attr_group); -} - -/* interface registration */ - -static struct class_interface rtc_sysfs_interface = { - .add = &rtc_sysfs_add_device, - .remove = &rtc_sysfs_remove_device, -}; - -static int __init rtc_sysfs_init(void) -{ - return rtc_interface_register(&rtc_sysfs_interface); } -static void __exit rtc_sysfs_exit(void) +void __init rtc_sysfs_init(struct class *rtc_class) { - class_interface_unregister(&rtc_sysfs_interface); + rtc_class->class_dev_attrs = rtc_attrs; } - -subsys_initcall(rtc_sysfs_init); -module_exit(rtc_sysfs_exit); - -MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>"); -MODULE_DESCRIPTION("RTC class sysfs interface"); -MODULE_LICENSE("GPL"); |