Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6059
-gerrit
commit 772f7eea2617037dfecc8396b79c2eca14226e6b Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Tue Jun 17 20:13:08 2014 +1000
src/ec: Sanitize headers and comment #endif pairings
Comment #endif /* FOO */ pairings. Alphabetise headers and remove any #if CONFIG_ guards around them.
Background rational: Remove guarding the inclusion of headers based on CONFIG_ options. This *potentially* could hide issues such as functions being swapped from under our feet, since different runtime behaviour could be declared with the same function same name and type-signature. Hence, depending on the header we happen to get may change runtime behaviour.
Change-Id: Ic61bdfb64d99f0e2998c6451ae6686915b7bb3d4 Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/ec/acpi/ec.h | 3 +-- src/ec/google/chromeec/ec.c | 3 +-- src/ec/google/chromeec/ec_i2c.c | 1 + src/ec/google/chromeec/ec_lpc.c | 8 ++++---- src/ec/google/chromeec/ec_message.h | 2 +- src/ec/google/chromeec/ec_spi.c | 1 + src/ec/lenovo/h8/chip.h | 3 ++- src/ec/lenovo/h8/h8.c | 9 +++++---- src/ec/lenovo/h8/h8.h | 3 ++- src/ec/lenovo/pmh7/chip.h | 3 ++- src/ec/lenovo/pmh7/pmh7.c | 7 ++----- src/ec/lenovo/pmh7/pmh7.h | 3 ++- src/ec/quanta/ene_kb3940q/ec.c | 5 +++-- src/ec/quanta/it8518/ec.c | 13 ++++--------- src/ec/smsc/mec1308/ec.c | 3 ++- 15 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/src/ec/acpi/ec.h b/src/ec/acpi/ec.h index 8fc88d2..82266bf 100644 --- a/src/ec/acpi/ec.h +++ b/src/ec/acpi/ec.h @@ -49,5 +49,4 @@ void ec_set_bit(u8 addr, u8 bit); void ec_clr_bit(u8 addr, u8 bit); void ec_set_ports(u16 cmd_reg, u16 data_reg);
-#endif - +#endif /* _EC_ACPI_H */ diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c index 6e7ecdf..ab4db54 100644 --- a/src/ec/google/chromeec/ec.c +++ b/src/ec/google/chromeec/ec.c @@ -24,12 +24,11 @@ #include <delay.h> #include <arch/hlt.h> #include <reset.h> -#ifndef __PRE_RAM__ #include <elog.h> #include <stdlib.h> #include <string.h> + #include "chip.h" -#endif #include "ec.h" #include "ec_commands.h"
diff --git a/src/ec/google/chromeec/ec_i2c.c b/src/ec/google/chromeec/ec_i2c.c index a13dde6..da11a96 100644 --- a/src/ec/google/chromeec/ec_i2c.c +++ b/src/ec/google/chromeec/ec_i2c.c @@ -23,6 +23,7 @@ #include <device/i2c.h> #include <stdint.h> #include <string.h> + #include "ec.h" #include "ec_commands.h"
diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c index 8b1cb2f..4cd30f3 100644 --- a/src/ec/google/chromeec/ec_lpc.c +++ b/src/ec/google/chromeec/ec_lpc.c @@ -17,14 +17,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
-#include <stdint.h> -#include <stdlib.h> - -#include <console/console.h> #include <arch/io.h> +#include <console/console.h> #include <delay.h> #include <device/pnp.h> #include <pc80/keyboard.h> +#include <stdint.h> +#include <stdlib.h> + #include "chip.h" #include "ec.h" #include "ec_commands.h" diff --git a/src/ec/google/chromeec/ec_message.h b/src/ec/google/chromeec/ec_message.h index a2421c7..7e7e51e 100644 --- a/src/ec/google/chromeec/ec_message.h +++ b/src/ec/google/chromeec/ec_message.h @@ -41,4 +41,4 @@ enum { MSG_BYTES = EC_HOST_PARAM_SIZE + MSG_PROTO_BYTES, };
-#endif +#endif /* _CROS_MESSAGE_H */ diff --git a/src/ec/google/chromeec/ec_spi.c b/src/ec/google/chromeec/ec_spi.c index 5525e31..cc2c9ba 100644 --- a/src/ec/google/chromeec/ec_spi.c +++ b/src/ec/google/chromeec/ec_spi.c @@ -19,6 +19,7 @@
#include <console/console.h> #include <spi-generic.h> + #include "ec.h" #include "ec_commands.h"
diff --git a/src/ec/lenovo/h8/chip.h b/src/ec/lenovo/h8/chip.h index 37998ee..bac54ec 100644 --- a/src/ec/lenovo/h8/chip.h +++ b/src/ec/lenovo/h8/chip.h @@ -50,4 +50,5 @@ struct ec_lenovo_h8_config { u8 has_keyboard_backlight; u8 has_power_management_beeps; }; -#endif + +#endif /* EC_LENOVO_H8EC_CHIP_H */ diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index 8fffd5a..f5b1b77 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -20,14 +20,15 @@ #include <arch/io.h> #include <console/console.h> #include <device/device.h> -#include <ec/acpi/ec.h> #include <device/pnp.h> +#include <ec/acpi/ec.h> +#include <kconfig.h> #include <stdlib.h> +#include <string.h> +#include <pc80/mc146818rtc.h> + #include "h8.h" #include "chip.h" -#include <pc80/mc146818rtc.h> -#include <string.h> -#include <kconfig.h>
static void h8_bluetooth_enable(int on) { diff --git a/src/ec/lenovo/h8/h8.h b/src/ec/lenovo/h8/h8.h index dda3f65..6b3d4db 100644 --- a/src/ec/lenovo/h8/h8.h +++ b/src/ec/lenovo/h8/h8.h @@ -124,4 +124,5 @@ void h8_mainboard_init_dock (void);
#define H8_EVENT_FN_F5 0x64 #define H8_EVENT_FN_F6 0x65 -#endif + +#endif /* EC_LENOVO_H8_H */ diff --git a/src/ec/lenovo/pmh7/chip.h b/src/ec/lenovo/pmh7/chip.h index 4198f66..40a4956 100644 --- a/src/ec/lenovo/pmh7/chip.h +++ b/src/ec/lenovo/pmh7/chip.h @@ -24,4 +24,5 @@ struct ec_lenovo_pmh7_config { int backlight_enable:1; int dock_event_enable:1; }; -#endif + +#endif /* EC_LENOVO_PMH7_CHIP_H */ diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c index a4d0ccc..cb0e27b 100644 --- a/src/ec/lenovo/pmh7/pmh7.c +++ b/src/ec/lenovo/pmh7/pmh7.c @@ -19,16 +19,13 @@
#include <arch/io.h> #include <console/console.h> -#ifndef __PRE_RAM__ -#ifndef __SMM__ #include <device/device.h> #include <device/pnp.h> -#endif -#endif #include <stdlib.h> +#include <pc80/mc146818rtc.h> + #include "pmh7.h" #include "chip.h" -#include <pc80/mc146818rtc.h>
void pmh7_backlight_enable(int onoff) { diff --git a/src/ec/lenovo/pmh7/pmh7.h b/src/ec/lenovo/pmh7/pmh7.h index 4cd9535..fb68408 100644 --- a/src/ec/lenovo/pmh7/pmh7.h +++ b/src/ec/lenovo/pmh7/pmh7.h @@ -36,4 +36,5 @@ void pmh7_dock_event_enable(int onoff); void pmh7_touchpad_enable(int onoff); void pmh7_ultrabay_power_enable(int onoff); void pmh7_trackpoint_enable(int onoff); -#endif + +#endif /* EC_LENOVO_PMH7_H */ diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c index 7d0e6ae..f0a2308 100644 --- a/src/ec/quanta/ene_kb3940q/ec.c +++ b/src/ec/quanta/ene_kb3940q/ec.c @@ -21,14 +21,15 @@
#ifndef __PRE_RAM__
-#include <console/console.h> #include <arch/io.h> +#include <console/console.h> #include <device/device.h> #include <device/pnp.h> -#include <stdlib.h> #include <delay.h> #include <elog.h> +#include <stdlib.h> #include <pc80/keyboard.h> + #include "ec.h" #include "chip.h"
diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c index 9e6d3d0..b9cb68f 100644 --- a/src/ec/quanta/it8518/ec.c +++ b/src/ec/quanta/it8518/ec.c @@ -19,19 +19,14 @@ * MA 02110-1301 USA */
- - +#include <arch/io.h> #include <console/console.h> -#include <pc80/keyboard.h> - -#ifndef __PRE_RAM__ +#include <delay.h> #include <device/device.h> #include <device/pnp.h> -#endif - +#include <pc80/keyboard.h> #include <stdlib.h> -#include <arch/io.h> -#include <delay.h> + #include "ec.h" #include "chip.h"
diff --git a/src/ec/smsc/mec1308/ec.c b/src/ec/smsc/mec1308/ec.c index fdae5e4..4d3b30a 100644 --- a/src/ec/smsc/mec1308/ec.c +++ b/src/ec/smsc/mec1308/ec.c @@ -19,10 +19,11 @@ * MA 02110-1301 USA */
+#include <arch/io.h> #include <console/console.h> #include <device/device.h> -#include <arch/io.h> #include <delay.h> + #include "ec.h" #include "chip.h"