Changes in / [f220e25:82d062d8] in mainline

File:

• uspace/drv/time/cmos-rtc/cmos-rtc.c (modified) (5 diffs)

uspace/drv/time/cmos-rtc/cmos-rtc.c

@@ -100 +100 @@
 static time_t uptime_get(void);
 static bool is_battery_ok(rtc_t *rtc);
-static int  rtc_fun_online(ddf_fun_t *fun);
-static int  rtc_fun_offline(ddf_fun_t *fun);
 
 static ddf_dev_ops_t rtc_dev_ops;
@@ -109 +107 @@
         .dev_add = rtc_dev_add,
         .dev_remove = rtc_dev_remove,
-        .fun_online = rtc_fun_online,
-        .fun_offline = rtc_fun_offline,
 };
 
@@ -410 +406 @@
         /* Try to normalize the content of the tm structure */
         time_t r = mktime(t);
-        int result;
-
-        if (r < 0)
-                result = EINVAL;
-        else {
-                rtc->boottime = r - uptime_get();
-                result = EOK;
-        }
+
+        rtc->boottime = r - uptime_get();
 
         fibril_mutex_unlock(&rtc->mutex);
 
-        return result;
+        return r < 0 ? EINVAL : EOK;
 }
 
@@ -648 +638 @@
         fibril_mutex_unlock(&rtc->mutex);
 
-        rc = rtc_fun_offline(rtc->fun);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed to offline function");
-                return rc;
-        }
-
         rc = ddf_fun_unbind(rtc->fun);
         if (rc != EOK) {
@@ -742 +726 @@
 }
 
-static int
-rtc_fun_online(ddf_fun_t *fun)
-{
-        ddf_msg(LVL_DEBUG, "rtc_fun_online()");
-        return ddf_fun_online(fun);
-}
-
-static int
-rtc_fun_offline(ddf_fun_t *fun)
-{
-        ddf_msg(LVL_DEBUG, "rtc_fun_offline()");
-        return ddf_fun_offline(fun);
-}
-
 int
 main(int argc, char **argv)