rtc: class: remove unnecessary device_get() in rtc_device_unregister
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 20 Jul 2015 23:02:50 +0000 (16:02 -0700)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Sat, 5 Sep 2015 11:19:07 +0000 (13:19 +0200)
Technically the address of rtc->dev can never be NULL, so get_device()
can never fail. Also caller of rtc_device_unregister() supposed to be
the owner of the device and thus have a valid reference. Therefore
call to get_device() is not needed here.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
drivers/rtc/class.c

index eb82ec2a21bd845eb07e3b2db872c8a63d18ae8c..de7707f7e7666a009be0f6b8e28c100356ecb370 100644 (file)
@@ -266,19 +266,18 @@ 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_sysfs_del_device(rtc);
+       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);