UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

rtc: convert class code to use dev_groups 

The dev_attrs field of struct class is going away soon, dev_groups
should be used instead.  This converts the rtc class code to use the
correct field.

Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-07-24 15:05:22 -07:00
parent b78b6b3a9a
commit f21e683508
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/rtc/rtc-sysfs.c
View File

@ -25,15 +25,14 @@
*/ */
static ssize_t static ssize_t
rtc_sysfs_show_name(struct device *dev, struct device_attribute *attr, name_show(struct device *dev, struct device_attribute *attr, char *buf)
char *buf)
{ {
return sprintf(buf, "%s\n", to_rtc_device(dev)->name); return sprintf(buf, "%s\n", to_rtc_device(dev)->name);
} }
static DEVICE_ATTR_RO(name);
static ssize_t static ssize_t
rtc_sysfs_show_date(struct device *dev, struct device_attribute *attr, date_show(struct device *dev, struct device_attribute *attr, char *buf)
char *buf)
{ {
ssize_t retval; ssize_t retval;
struct rtc_time tm; struct rtc_time tm;
@ -46,10 +45,10 @@ rtc_sysfs_show_date(struct device *dev, struct device_attribute *attr,
return retval; return retval;
} }
static DEVICE_ATTR_RO(date);
static ssize_t static ssize_t
rtc_sysfs_show_time(struct device *dev, struct device_attribute *attr, time_show(struct device *dev, struct device_attribute *attr, char *buf)
char *buf)
{ {
ssize_t retval; ssize_t retval;
struct rtc_time tm; struct rtc_time tm;
@ -62,10 +61,10 @@ rtc_sysfs_show_time(struct device *dev, struct device_attribute *attr,
return retval; return retval;
} }
static DEVICE_ATTR_RO(time);
static ssize_t static ssize_t
rtc_sysfs_show_since_epoch(struct device *dev, struct device_attribute *attr, since_epoch_show(struct device *dev, struct device_attribute *attr, char *buf)
char *buf)
{ {
ssize_t retval; ssize_t retval;
struct rtc_time tm; struct rtc_time tm;
@ -79,16 +78,16 @@ rtc_sysfs_show_since_epoch(struct device *dev, struct device_attribute *attr,
return retval; return retval;
} }
static DEVICE_ATTR_RO(since_epoch);
static ssize_t static ssize_t
rtc_sysfs_show_max_user_freq(struct device *dev, struct device_attribute *attr, max_user_freq_show(struct device *dev, struct device_attribute *attr, char *buf)
char *buf)
{ {
return sprintf(buf, "%d\n", to_rtc_device(dev)->max_user_freq); return sprintf(buf, "%d\n", to_rtc_device(dev)->max_user_freq);
} }
static ssize_t static ssize_t
rtc_sysfs_set_max_user_freq(struct device *dev, struct device_attribute *attr, max_user_freq_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t n) const char *buf, size_t n)
{ {
struct rtc_device *rtc = to_rtc_device(dev); struct rtc_device *rtc = to_rtc_device(dev);
@ -101,6 +100,7 @@ rtc_sysfs_set_max_user_freq(struct device *dev, struct device_attribute *attr,
return n; return n;
} }
static DEVICE_ATTR_RW(max_user_freq);
/** /**
* rtc_sysfs_show_hctosys - indicate if the given RTC set the system time * rtc_sysfs_show_hctosys - indicate if the given RTC set the system time
@ -109,8 +109,7 @@ rtc_sysfs_set_max_user_freq(struct device *dev, struct device_attribute *attr,
* boot or resume event. * boot or resume event.
*/ */
static ssize_t static ssize_t
rtc_sysfs_show_hctosys(struct device *dev, struct device_attribute *attr, hctosys_show(struct device *dev, struct device_attribute *attr, char *buf)
char *buf)
{ {
#ifdef CONFIG_RTC_HCTOSYS_DEVICE #ifdef CONFIG_RTC_HCTOSYS_DEVICE
if (rtc_hctosys_ret == 0 && if (rtc_hctosys_ret == 0 &&
@ -121,17 +120,18 @@ rtc_sysfs_show_hctosys(struct device *dev, struct device_attribute *attr,
#endif #endif
return sprintf(buf, "0\n"); return sprintf(buf, "0\n");
} }
static DEVICE_ATTR_RO(hctosys);
static struct device_attribute rtc_attrs[] = { static struct attribute *rtc_attrs[] = {
__ATTR(name, S_IRUGO, rtc_sysfs_show_name, NULL), &dev_attr_name.attr,
__ATTR(date, S_IRUGO, rtc_sysfs_show_date, NULL), &dev_attr_date.attr,
__ATTR(time, S_IRUGO, rtc_sysfs_show_time, NULL), &dev_attr_time.attr,
__ATTR(since_epoch, S_IRUGO, rtc_sysfs_show_since_epoch, NULL), &dev_attr_since_epoch.attr,
__ATTR(max_user_freq, S_IRUGO | S_IWUSR, rtc_sysfs_show_max_user_freq, &dev_attr_max_user_freq.attr,
rtc_sysfs_set_max_user_freq), &dev_attr_hctosys.attr,
__ATTR(hctosys, S_IRUGO, rtc_sysfs_show_hctosys, NULL), NULL,
{ },
}; };
ATTRIBUTE_GROUPS(rtc);
static ssize_t static ssize_t
rtc_sysfs_show_wakealarm(struct device *dev, struct device_attribute *attr, rtc_sysfs_show_wakealarm(struct device *dev, struct device_attribute *attr,
@ -261,5 +261,5 @@ void rtc_sysfs_del_device(struct rtc_device *rtc)
void __init rtc_sysfs_init(struct class *rtc_class) void __init rtc_sysfs_init(struct class *rtc_class)
{ {
rtc_class->dev_attrs = rtc_attrs; rtc_class->dev_groups = rtc_groups;
} }