string: factorize skip_spaces and export it to be generally available

[safe/jmp/linux-2.6] / drivers / rtc / rtc-proc.c

diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index d51d8f2..c086fc3 100644 (file)
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -16,18 +16,18 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 
-static struct class_device *rtc_dev = NULL;
-static DEFINE_MUTEX(rtc_lock);
+#include "rtc-core.h"
+
 
 static int rtc_proc_show(struct seq_file *seq, void *offset)
 {
        int err;
-       struct class_device *class_dev = seq->private;
-       const struct rtc_class_ops *ops = to_rtc_device(class_dev)->ops;
+       struct rtc_device *rtc = seq->private;
+       const struct rtc_class_ops *ops = rtc->ops;
        struct rtc_wkalrm alrm;
        struct rtc_time tm;
 
-       err = rtc_read_time(class_dev, &tm);
+       err = rtc_read_time(rtc, &tm);
        if (err == 0) {
                seq_printf(seq,
                        "rtc_time\t: %02d:%02d:%02d\n"
@@ -36,7 +36,7 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
                        tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
        }
 
-       err = rtc_read_alarm(class_dev, &alrm);
+       err = rtc_read_alarm(rtc, &alrm);
        if (err == 0) {
                seq_printf(seq, "alrm_time\t: ");
                if ((unsigned int)alrm.time.tm_hour <= 24)
@@ -65,7 +65,7 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
                        seq_printf(seq, "%02d\n", alrm.time.tm_mday);
                else
                        seq_printf(seq, "**\n");
-               seq_printf(seq, "alrm_wakeup\t: %s\n",
+               seq_printf(seq, "alarm_IRQ\t: %s\n",
                                alrm.enabled ? "yes" : "no");
                seq_printf(seq, "alrm_pending\t: %s\n",
                                alrm.pending ? "yes" : "no");
@@ -74,19 +74,19 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
        seq_printf(seq, "24hr\t\t: yes\n");
 
        if (ops->proc)
-               ops->proc(class_dev->dev, seq);
+               ops->proc(rtc->dev.parent, seq);
 
        return 0;
 }
 
 static int rtc_proc_open(struct inode *inode, struct file *file)
 {
-       struct class_device *class_dev = PDE(inode)->data;
+       struct rtc_device *rtc = PDE(inode)->data;
 
        if (!try_module_get(THIS_MODULE))
                return -ENODEV;
 
-       return single_open(file, rtc_proc_show, class_dev);
+       return single_open(file, rtc_proc_show, rtc);
 }
 
 static int rtc_proc_release(struct inode *inode, struct file *file)
@@ -96,69 +96,21 @@ static int rtc_proc_release(struct inode *inode, struct file *file)
        return res;
 }
 
-static struct file_operations rtc_proc_fops = {
+static const struct file_operations rtc_proc_fops = {
        .open           = rtc_proc_open,
        .read           = seq_read,
        .llseek         = seq_lseek,
        .release        = rtc_proc_release,
 };
 
-static int rtc_proc_add_device(struct class_device *class_dev,
-                                       struct class_interface *class_intf)
+void rtc_proc_add_device(struct rtc_device *rtc)
 {
-       mutex_lock(&rtc_lock);
-       if (rtc_dev == NULL) {
-               struct proc_dir_entry *ent;
-
-               rtc_dev = class_dev;
-
-               ent = create_proc_entry("driver/rtc", 0, NULL);
-               if (ent) {
-                       struct rtc_device *rtc = to_rtc_device(class_dev);
-
-                       ent->proc_fops = &rtc_proc_fops;
-                       ent->owner = rtc->owner;
-                       ent->data = class_dev;
-
-                       dev_info(class_dev->dev, "rtc intf: proc\n");
-               }
-               else
-                       rtc_dev = NULL;
-       }
-       mutex_unlock(&rtc_lock);
-
-       return 0;
+       if (rtc->id == 0)
+               proc_create_data("driver/rtc", 0, NULL, &rtc_proc_fops, rtc);
 }
 
-static void rtc_proc_remove_device(struct class_device *class_dev,
-                                       struct class_interface *class_intf)
+void rtc_proc_del_device(struct rtc_device *rtc)
 {
-       mutex_lock(&rtc_lock);
-       if (rtc_dev == class_dev) {
+       if (rtc->id == 0)
                remove_proc_entry("driver/rtc", NULL);
-               rtc_dev = NULL;
-       }
-       mutex_unlock(&rtc_lock);
 }
-
-static struct class_interface rtc_proc_interface = {
-       .add = &rtc_proc_add_device,
-       .remove = &rtc_proc_remove_device,
-};
-
-static int __init rtc_proc_init(void)
-{
-       return rtc_interface_register(&rtc_proc_interface);
-}
-
-static void __exit rtc_proc_exit(void)
-{
-       class_interface_unregister(&rtc_proc_interface);
-}
-
-subsys_initcall(rtc_proc_init);
-module_exit(rtc_proc_exit);
-
-MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
-MODULE_DESCRIPTION("RTC class proc interface");
-MODULE_LICENSE("GPL");