kmemtrace: trace kfree() calls with NULL or zero-length objects

[sfrench/cifs-2.6.git] / drivers / rtc / rtc-parisc.c

diff --git a/drivers/rtc/rtc-parisc.c b/drivers/rtc/rtc-parisc.c
index c6bfa6fe1a2a289dddc0748ebd660df195087724..b966f56da976e4dec379c56eb6fcc88545883295 100644 (file)
--- a/drivers/rtc/rtc-parisc.c
+++ b/drivers/rtc/rtc-parisc.c
@@ -7,41 +7,25 @@
 #include <linux/module.h>
 #include <linux/time.h>
 #include <linux/platform_device.h>
+#include <linux/rtc.h>
 
 #include <asm/rtc.h>
 
-/* as simple as can be, and no simpler. */
-struct parisc_rtc {
-       struct rtc_device *rtc;
-       spinlock_t lock;
-};
-
 static int parisc_get_time(struct device *dev, struct rtc_time *tm)
 {
-       struct parisc_rtc *p = dev_get_drvdata(dev);
-       unsigned long flags, ret;
+       unsigned long ret;
 
-       spin_lock_irqsave(&p->lock, flags);
        ret = get_rtc_time(tm);
-       spin_unlock_irqrestore(&p->lock, flags);
 
        if (ret & RTC_BATT_BAD)
                return -EOPNOTSUPP;
 
-       return 0;
+       return rtc_valid_tm(tm);
 }
 
 static int parisc_set_time(struct device *dev, struct rtc_time *tm)
 {
-       struct parisc_rtc *p = dev_get_drvdata(dev);
-       unsigned long flags;
-       int ret;
-
-       spin_lock_irqsave(&p->lock, flags);
-       ret = set_rtc_time(tm);
-       spin_unlock_irqrestore(&p->lock, flags);
-
-       if (ret < 0)
+       if (set_rtc_time(tm) < 0)
                return -EOPNOTSUPP;
 
        return 0;
@@ -52,35 +36,25 @@ static const struct rtc_class_ops parisc_rtc_ops = {
        .set_time = parisc_set_time,
 };
 
-static int __devinit parisc_rtc_probe(struct platform_device *dev)
+static int __init parisc_rtc_probe(struct platform_device *dev)
 {
-       struct parisc_rtc *p;
-
-       p = kzalloc(sizeof (*p), GFP_KERNEL);
-       if (!p)
-               return -ENOMEM;
-
-       spin_lock_init(&p->lock);
+       struct rtc_device *rtc;
 
-       p->rtc = rtc_device_register("rtc-parisc", &dev->dev, &parisc_rtc_ops,
-                                       THIS_MODULE);
-       if (IS_ERR(p->rtc)) {
-               int err = PTR_ERR(p->rtc);
-               kfree(p);
-               return err;
-       }
+       rtc = rtc_device_register("rtc-parisc", &dev->dev, &parisc_rtc_ops,
+                                 THIS_MODULE);
+       if (IS_ERR(rtc))
+               return PTR_ERR(rtc);
 
-       platform_set_drvdata(dev, p);
+       platform_set_drvdata(dev, rtc);
 
        return 0;
 }
 
-static int __devexit parisc_rtc_remove(struct platform_device *dev)
+static int __exit parisc_rtc_remove(struct platform_device *dev)
 {
-       struct parisc_rtc *p = platform_get_drvdata(dev);
+       struct rtc_device *rtc = platform_get_drvdata(dev);
 
-       rtc_device_unregister(p->rtc);
-       kfree(p);
+       rtc_device_unregister(rtc);
 
        return 0;
 }
@@ -96,7 +70,7 @@ static struct platform_driver parisc_rtc_driver = {
 
 static int __init parisc_rtc_init(void)
 {
-       return platform_driver_register(&parisc_rtc_driver);
+       return platform_driver_probe(&parisc_rtc_driver, parisc_rtc_probe);
 }
 
 static void __exit parisc_rtc_fini(void)