am e34618a2: am d2ac1d8c: am eb3e9daf: Merge "toolbox: date: fix parameter type warnings"
* commit 'e34618a24cf82374d3f096f5aa6d9e011b16a519':
toolbox: date: fix parameter type warnings
diff --git a/charger/charger.c b/charger/charger.c
index dda24ae..66ddeaf 100644
--- a/charger/charger.c
+++ b/charger/charger.c
@@ -67,7 +67,6 @@
#define BATTERY_FULL_THRESH 95
#define LAST_KMSG_PATH "/proc/last_kmsg"
-#define LAST_KMSG_PSTORE_PATH "/sys/fs/pstore/console-ramoops"
#define LAST_KMSG_MAX_SZ (32 * 1024)
#define LOGE(x...) do { KLOG_ERROR("charger", x); } while (0)
@@ -212,14 +211,10 @@
LOGI("\n");
LOGI("*************** LAST KMSG ***************\n");
LOGI("\n");
- buf = load_file(LAST_KMSG_PSTORE_PATH, &sz);
-
+ buf = load_file(LAST_KMSG_PATH, &sz);
if (!buf || !sz) {
- buf = load_file(LAST_KMSG_PATH, &sz);
- if (!buf || !sz) {
- LOGI("last_kmsg not found. Cold reset?\n");
- goto out;
- }
+ LOGI("last_kmsg not found. Cold reset?\n");
+ goto out;
}
len = min(sz, LAST_KMSG_MAX_SZ);