From 56a0656ed91a01fdf09f9704a1f8a8aeb5d9f3b7 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Sat, 28 Mar 2015 11:23:32 -0700
Subject: [PATCH] Further cleanup of the logic in device_init.

Change-Id: I96e4b11894926b50792b9b7d7cfa0fe8392abef6
---
 init/devices.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/init/devices.cpp b/init/devices.cpp
index 1fa70ec1d..96b1696b4 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -992,22 +992,22 @@ void device_init() {
 
     /* is 256K enough? udev uses 16MB! */
     device_fd = uevent_open_socket(256*1024, true);
-    if(device_fd < 0)
+    if (device_fd == -1) {
         return;
-
+    }
     fcntl(device_fd, F_SETFL, O_NONBLOCK);
 
-    struct stat info;
-    if (stat(COLDBOOT_DONE, &info) < 0) {
-        Timer t;
-        coldboot("/sys/class");
-        coldboot("/sys/block");
-        coldboot("/sys/devices");
-        close(open(COLDBOOT_DONE, O_WRONLY|O_CREAT|O_CLOEXEC, 0000));
-        NOTICE("Coldboot took %.2fs.\n", t.duration());
-    } else {
+    if (access(COLDBOOT_DONE, F_OK) == 0) {
         NOTICE("Skipping coldboot, already done!\n");
+        return;
     }
+
+    Timer t;
+    coldboot("/sys/class");
+    coldboot("/sys/block");
+    coldboot("/sys/devices");
+    close(open(COLDBOOT_DONE, O_WRONLY|O_CREAT|O_CLOEXEC, 0000));
+    NOTICE("Coldboot took %.2fs.\n", t.duration());
 }
 
 int get_device_fd()