These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / rtc / class.c

diff --git a/kernel/drivers/rtc/class.c b/kernel/drivers/rtc/class.c
index ea2a315..de86578 100644 (file)
--- a/kernel/drivers/rtc/class.c
+++ b/kernel/drivers/rtc/class.c
@@ -202,6 +202,7 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
        rtc->max_user_freq = 64;
        rtc->dev.parent = dev;
        rtc->dev.class = rtc_class;
+       rtc->dev.groups = rtc_get_dev_attribute_groups();
        rtc->dev.release = rtc_device_release;
 
        mutex_init(&rtc->ops_lock);
@@ -234,12 +235,12 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
 
        err = device_register(&rtc->dev);
        if (err) {
+               /* This will free both memory and the ID */
                put_device(&rtc->dev);
-               goto exit_kfree;
+               goto exit;
        }
 
        rtc_dev_add_device(rtc);
-       rtc_sysfs_add_device(rtc);
        rtc_proc_add_device(rtc);
 
        dev_info(dev, "rtc core: registered %s as %s\n",
@@ -247,9 +248,6 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
 
        return rtc;
 
-exit_kfree:
-       kfree(rtc);
-
 exit_ida:
        ida_simple_remove(&rtc_ida, id);
 
@@ -268,19 +266,17 @@ EXPORT_SYMBOL_GPL(rtc_device_register);
  */
 void rtc_device_unregister(struct rtc_device *rtc)
 {
-       if (get_device(&rtc->dev) != NULL) {
-               mutex_lock(&rtc->ops_lock);
-               /* remove innards of this RTC, then disable it, before
-                * letting any rtc_class_open() users access it again
-                */
-               rtc_sysfs_del_device(rtc);
-               rtc_dev_del_device(rtc);
-               rtc_proc_del_device(rtc);
-               device_unregister(&rtc->dev);
-               rtc->ops = NULL;
-               mutex_unlock(&rtc->ops_lock);
-               put_device(&rtc->dev);
-       }
+       mutex_lock(&rtc->ops_lock);
+       /*
+        * Remove innards of this RTC, then disable it, before
+        * letting any rtc_class_open() users access it again
+        */
+       rtc_dev_del_device(rtc);
+       rtc_proc_del_device(rtc);
+       device_del(&rtc->dev);
+       rtc->ops = NULL;
+       mutex_unlock(&rtc->ops_lock);
+       put_device(&rtc->dev);
 }
 EXPORT_SYMBOL_GPL(rtc_device_unregister);
 
@@ -363,7 +359,6 @@ static int __init rtc_init(void)
        }
        rtc_class->pm = RTC_CLASS_DEV_PM_OPS;
        rtc_dev_init();
-       rtc_sysfs_init(rtc_class);
        return 0;
 }