From: Marek Vasut Date: Tue, 10 Nov 2015 19:53:27 +0000 (+0100) Subject: eeprom: Suck the ifdef into eeprom_init() X-Git-Tag: v2016.01-rc2~150 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8eee40a602deacb2ec0ebd1deed3e732bd470bbc;p=platform%2Fkernel%2Fu-boot.git eeprom: Suck the ifdef into eeprom_init() Just suck the ugly ifdef around eeprom_init() call into eeprom_init() function itself. This puts all of the ifdef mess into one place. Signed-off-by: Marek Vasut Cc: Simon Glass Cc: Tom Rini Cc: Heiko Schocher Reviewed-by: Heiko Schocher --- diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c index 8451d63657..c38c534968 100644 --- a/common/cmd_eeprom.c +++ b/common/cmd_eeprom.c @@ -57,7 +57,7 @@ void eeprom_init(void) { /* SPI EEPROM */ #if defined(CONFIG_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C) - spi_init_f (); + spi_init_f(); #endif /* I2C EEPROM */ @@ -248,9 +248,7 @@ static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) off = simple_strtoul(*args++, NULL, 16); cnt = simple_strtoul(*args++, NULL, 16); -# if !defined(CONFIG_SPI) || defined(CONFIG_ENV_EEPROM_IS_ON_I2C) - eeprom_init (); -# endif /* !CONFIG_SPI */ + eeprom_init(); if (strcmp (argv[1], "read") == 0) { printf(fmt, dev_addr, argv[1], addr, off, cnt);