Merge git://git.infradead.org/battery-2.6

[linux-2.6] / drivers / rtc / rtc-sysfs.c

diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index 69df94b4484169d0a61b5c08f32f3e0e6133f716..2ae0e8304d3aa83bd7f75cdd6052b4394ba31a8b 100644 (file)
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -73,11 +73,35 @@ rtc_sysfs_show_since_epoch(struct device *dev, struct device_attribute *attr,
        return retval;
 }
 
+static ssize_t
+rtc_sysfs_show_max_user_freq(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,
+               const char *buf, size_t n)
+{
+       struct rtc_device *rtc = to_rtc_device(dev);
+       unsigned long val = simple_strtoul(buf, NULL, 0);
+
+       if (val >= 4096 || val == 0)
+               return -EINVAL;
+
+       rtc->max_user_freq = (int)val;
+
+       return n;
+}
+
 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),
        { },
 };
 
@@ -176,9 +200,8 @@ void rtc_sysfs_add_device(struct rtc_device *rtc)
 
        err = device_create_file(&rtc->dev, &dev_attr_wakealarm);
        if (err)
-               dev_err(rtc->dev.parent, "failed to create "
-                               "alarm attribute, %d",
-                               err);
+               dev_err(rtc->dev.parent,
+                       "failed to create alarm attribute, %d\n", err);
 }
 
 void rtc_sysfs_del_device(struct rtc_device *rtc)