Clean up inits

We can clear the reset cause in system pre-init now because of a
previous change which preserves it across a sysjump.

Signed-off-by: Randall Spangler <rspangler@chromium.org>

BUG=none
TEST=if it boots, it works

Change-Id: I1d8b99df5a0be0de9545d22ad1a6b7fb3140f813

5 files changed, 6 insertions, 20 deletions

diff --git a/include/charger.h b/include/charger.h
index 65ba8c1b48..899dbd4883 100644
--- a/include/charger.h
+++ b/include/charger.h
@@ -27,9 +27,6 @@ struct charger_info {
 	uint16_t input_current_step;
 };
 
-/* Initializes the charger */
-int charger_init(void);
-
 /* Power state machine post init */
 int charger_post_init(void);
 
diff --git a/include/chip_temp_sensor.h b/include/chip_temp_sensor.h
index 08417cd3d8..867733d2db 100644
--- a/include/chip_temp_sensor.h
+++ b/include/chip_temp_sensor.h
@@ -5,8 +5,8 @@
 
 /* Temperature sensor module for LM4 chip */
 
-#ifndef __CHIP_TEMP_SENSOR_H
-#define __CHIP_TEMP_SENSOR_H
+#ifndef __CROS_EC_CHIP_TEMP_SENSOR_H
+#define __CROS_EC_CHIP_TEMP_SENSOR_H
 
 struct temp_sensor_t;
 
@@ -16,6 +16,4 @@ int chip_temp_sensor_poll(void);
 /* Temperature reading function. Return temperature in K. */
 int chip_temp_sensor_get_val(int idx);
 
-int chip_temp_sensor_init(void);
-
-#endif /* __CHIP_TEMP_SENSOR_H */
+#endif /* __CROS_EC_CHIP_TEMP_SENSOR_H */
diff --git a/include/port80.h b/include/port80.h
index 060ee7bbd8..787af8c169 100644
--- a/include/port80.h
+++ b/include/port80.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -10,9 +10,6 @@
 
 #include "common.h"
 
-/* Initializes the module. */
-int port_80_init(void);
-
 /* Called by LPC module when a byte of data is written to port 80. */
 void port_80_write(int data);
 
diff --git a/include/system.h b/include/system.h
index 799d324998..36a8998b35 100644
--- a/include/system.h
+++ b/include/system.h
@@ -53,9 +53,6 @@ int system_pre_init(void);
  * system_pre_init(). */
 int system_common_pre_init(void);
 
-/* Initializes the system module. */
-int system_init(void);
-
 /* Returns the cause of the last reset, or SYSTEM_RESET_UNKNOWN if
  * the cause is not known. */
 enum system_reset_cause_t system_get_reset_cause(void);
diff --git a/include/temp_sensor.h b/include/temp_sensor.h
index d3ce646a19..158868b66c 100644
--- a/include/temp_sensor.h
+++ b/include/temp_sensor.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -42,10 +42,7 @@ struct temp_sensor_t {
 	int idx;
 };
 
-/* Initializes the module. */
-int temp_sensor_init(void);
-
-/* Returns the most recently measured temperature for the sensor in K,
+/* Return the most recently measured temperature for the sensor in K,
  * or -1 if error. */
 int temp_sensor_read(enum temp_sensor_id id);