X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fhwclock.c;h=7059d9c75b8367a0cb1d3b39983d74087cc54f6d;hp=837f51f9478839385b60c9823ebb67374f9991de;hb=fa041593fe04b12ffd7e81d8b3598a7a6f313fb3;hpb=2b3c81b02fa5dd47b19558c7684e113f36a48486

diff --git a/src/shared/hwclock.c b/src/shared/hwclock.c
index 837f51f94..7059d9c75 100644
--- a/src/shared/hwclock.c
+++ b/src/shared/hwclock.c
@@ -43,122 +43,40 @@
 #include "hwclock.h"
 #include "fileio.h"
 
-static int rtc_open(int flags) {
-        int fd;
-        DIR *d;
-
-        /*
-         * Some "chaotic platforms" have multiple RTCs and we need to
-         * find the "system RTC", which is in some setups /dev/rtc1.
-         *
-         * First, we try to find the RTC which has hctosys=1 set. If we
-         * don't find any we just take the first RTC that exists at all,
-         * then try to open /dev/rtc0.
-         */
-        d = opendir("/sys/class/rtc");
-        if (!d)
-                goto fallback;
-
-        for (;;) {
-                char *p, *v;
-                struct dirent *de;
-                union dirent_storage buf;
-                int r;
-
-                r = readdir_r(d, &buf.de, &de);
-                if (r != 0)
-                        goto fallback;
-
-                if (!de)
-                        goto fallback;
-
-                if (ignore_file(de->d_name))
-                        continue;
-
-                p = strjoin("/sys/class/rtc/", de->d_name, "/hctosys", NULL);
-                if (!p) {
-                        closedir(d);
-                        return -ENOMEM;
-                }
-
-                r = read_one_line_file(p, &v);
-                free(p);
-
-                if (r < 0)
-                        continue;
-
-                r = parse_boolean(v);
-                free(v);
-
-                if (r <= 0)
-                        continue;
-
-                p = strappend("/dev/", de->d_name);
-                if (!p) {
-                        closedir(d);
-                        return -ENOMEM;
-                }
-
-                fd = open(p, flags);
-                free(p);
-
-                if (fd >= 0) {
-                        closedir(d);
-                        return fd;
-                }
-        }
-
-fallback:
-        if (d)
-                closedir(d);
-
-        fd = open("/dev/rtc0", flags);
-        if (fd < 0)
-                return -errno;
-
-        return fd;
-}
-
 int hwclock_get_time(struct tm *tm) {
-        int fd;
-        int err = 0;
+        _cleanup_close_ int fd = -1;
 
         assert(tm);
 
-        fd = rtc_open(O_RDONLY|O_CLOEXEC);
+        fd = open("/dev/rtc", O_RDONLY|O_CLOEXEC);
         if (fd < 0)
                 return -errno;
 
         /* This leaves the timezone fields of struct tm
          * uninitialized! */
         if (ioctl(fd, RTC_RD_TIME, tm) < 0)
-                err = -errno;
+                return -errno;
 
         /* We don't know daylight saving, so we reset this in order not
-         * to confused mktime(). */
+         * to confuse mktime(). */
         tm->tm_isdst = -1;
 
-        close_nointr_nofail(fd);
-
-        return err;
+        return 0;
 }
 
 int hwclock_set_time(const struct tm *tm) {
-        int fd;
-        int err = 0;
+        _cleanup_close_ int fd = -1;
 
         assert(tm);
 
-        fd = rtc_open(O_RDONLY|O_CLOEXEC);
+        fd = open("/dev/rtc", O_RDONLY|O_CLOEXEC);
         if (fd < 0)
                 return -errno;
 
         if (ioctl(fd, RTC_SET_TIME, tm) < 0)
-                err = -errno;
-
-        close_nointr_nofail(fd);
+                return -errno;
 
-        return err;
+        return 0;
 }
 
 int hwclock_is_localtime(void) {
@@ -227,7 +145,7 @@ int hwclock_reset_timezone(void) {
         /*
          * The very first time we set the kernel's timezone, it will warp
          * the clock. Do a dummy call here, so the time warping is sealed
-         * and we set only the time zone with next call.
+         * and we set only the timezone with next call.
          */
         if (settimeofday(tv_null, &tz) < 0)
                 return -errno;