diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-09 15:24:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-09 15:24:25 -0700 |
| commit | aaf275f945460b5cb5ee6ea9ef95b06db5334461 (patch) | |
| tree | 8dd916f867832927b6cf9e91fbc14340ad8125a6 /rtc-convert-class-code-to-use-dev_groups.patch | |
| parent | 1cfe8e5d3a8ac05c5a39afc11f57ac2c9fdabaa5 (diff) | |
| download | patches-aaf275f945460b5cb5ee6ea9ef95b06db5334461.tar.gz | |
break patch up into proper pieces
Diffstat (limited to 'rtc-convert-class-code-to-use-dev_groups.patch')
| -rw-r--r-- | rtc-convert-class-code-to-use-dev_groups.patch | 137 |
1 files changed, 137 insertions, 0 deletions
diff --git a/rtc-convert-class-code-to-use-dev_groups.patch b/rtc-convert-class-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..422b897ae3e8ef --- /dev/null +++ b/rtc-convert-class-code-to-use-dev_groups.patch @@ -0,0 +1,137 @@ +From foo@baz Tue Jul 9 15:19:10 PDT 2013 +Date: Tue, 09 Jul 2013 15:19:10 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: 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. + +Cc: Alessandro Zummo <a.zummo@towertech.it> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + drivers/rtc/rtc-sysfs.c | 46 +++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) + +--- a/drivers/rtc/rtc-sysfs.c ++++ b/drivers/rtc/rtc-sysfs.c +@@ -25,15 +25,14 @@ + */ + + static ssize_t +-rtc_sysfs_show_name(struct device *dev, struct device_attribute *attr, +- char *buf) ++name_show(struct device *dev, struct device_attribute *attr, char *buf) + { + return sprintf(buf, "%s\n", to_rtc_device(dev)->name); + } ++static DEVICE_ATTR_RO(name); + + static ssize_t +-rtc_sysfs_show_date(struct device *dev, struct device_attribute *attr, +- char *buf) ++date_show(struct device *dev, struct device_attribute *attr, char *buf) + { + ssize_t retval; + struct rtc_time tm; +@@ -46,10 +45,10 @@ rtc_sysfs_show_date(struct device *dev, + + return retval; + } ++static DEVICE_ATTR_RO(date); + + static ssize_t +-rtc_sysfs_show_time(struct device *dev, struct device_attribute *attr, +- char *buf) ++time_show(struct device *dev, struct device_attribute *attr, char *buf) + { + ssize_t retval; + struct rtc_time tm; +@@ -62,10 +61,10 @@ rtc_sysfs_show_time(struct device *dev, + + return retval; + } ++static DEVICE_ATTR_RO(time); + + static ssize_t +-rtc_sysfs_show_since_epoch(struct device *dev, struct device_attribute *attr, +- char *buf) ++since_epoch_show(struct device *dev, struct device_attribute *attr, char *buf) + { + ssize_t retval; + struct rtc_time tm; +@@ -79,16 +78,16 @@ rtc_sysfs_show_since_epoch(struct device + + return retval; + } ++static DEVICE_ATTR_RO(since_epoch); + + static ssize_t +-rtc_sysfs_show_max_user_freq(struct device *dev, struct device_attribute *attr, +- char *buf) ++max_user_freq_show(struct device *dev, struct device_attribute *attr, char *buf) + { + return sprintf(buf, "%d\n", to_rtc_device(dev)->max_user_freq); + } + + 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) + { + struct rtc_device *rtc = to_rtc_device(dev); +@@ -101,6 +100,7 @@ rtc_sysfs_set_max_user_freq(struct devic + + return n; + } ++static DEVICE_ATTR_RW(max_user_freq); + + /** + * rtc_sysfs_show_hctosys - indicate if the given RTC set the system time +@@ -109,8 +109,7 @@ rtc_sysfs_set_max_user_freq(struct devic + * boot or resume event. + */ + static ssize_t +-rtc_sysfs_show_hctosys(struct device *dev, struct device_attribute *attr, +- char *buf) ++hctosys_show(struct device *dev, struct device_attribute *attr, char *buf) + { + #ifdef CONFIG_RTC_HCTOSYS_DEVICE + if (rtc_hctosys_ret == 0 && +@@ -121,17 +120,18 @@ rtc_sysfs_show_hctosys(struct device *de + #endif + return sprintf(buf, "0\n"); + } ++static DEVICE_ATTR_RO(hctosys); + +-static struct 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), +- __ATTR(max_user_freq, S_IRUGO | S_IWUSR, rtc_sysfs_show_max_user_freq, +- rtc_sysfs_set_max_user_freq), +- __ATTR(hctosys, S_IRUGO, rtc_sysfs_show_hctosys, NULL), +- { }, ++static struct attribute *rtc_attrs[] = { ++ &dev_attr_name.attr, ++ &dev_attr_date.attr, ++ &dev_attr_time.attr, ++ &dev_attr_since_epoch.attr, ++ &dev_attr_max_user_freq.attr, ++ &dev_attr_hctosys.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(rtc); + + static ssize_t + rtc_sysfs_show_wakealarm(struct device *dev, struct device_attribute *attr, +@@ -261,5 +261,5 @@ void rtc_sysfs_del_device(struct rtc_dev + + void __init rtc_sysfs_init(struct class *rtc_class) + { +- rtc_class->dev_attrs = rtc_attrs; ++ rtc_class->dev_groups = rtc_groups; + } |