eeprom: Pull out the I/O code

Pull out the code which does the I2C or SPI read/write, so that
the beefy ifdef around it is contained in a single function.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Tom Rini <trini@konsulko.com>
Cc: Heiko Schocher <hs@denx.de>
Reviewed-by: Heiko Schocher <hs@denx.de>

diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index 728606e5c412f8fb8c48bce5bf14416758b2b8a1..7797d0ec9c9c6446f961614f7baac53f64259378 100644 (file)
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -61,6 +61,34 @@ void eeprom_init(void)
 #endif
 }
 
+static int eeprom_rw_block(unsigned offset, uchar *addr, unsigned alen,
+                          uchar *buffer, unsigned len, bool read)
+{
+       int ret = 0;
+
+       /* SPI */
+#if defined(CONFIG_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
+       if (read)
+               spi_read(addr, alen, buffer, len);
+       else
+               spi_write(addr, alen, buffer, len);
+#else  /* I2C */
+
+#if defined(CONFIG_SYS_I2C_EEPROM_BUS)
+       i2c_set_bus_num(CONFIG_SYS_I2C_EEPROM_BUS);
+#endif
+
+       if (read)
+               ret = i2c_read(addr[0], offset, alen - 1, buffer, len);
+       else
+               ret = i2c_write(addr[0], offset, alen - 1, buffer, len);
+
+       if (ret)
+               ret = 1;
+#endif
+       return ret;
+}
+
 int eeprom_read (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt)
 {
        unsigned end = offset + cnt;
@@ -114,15 +142,8 @@ int eeprom_read (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt
                        len = maxlen;
 #endif
 
-#if defined(CONFIG_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
-               spi_read (addr, alen, buffer, len);
-#else
-#if defined(CONFIG_SYS_I2C_EEPROM_BUS)
-               i2c_set_bus_num(CONFIG_SYS_I2C_EEPROM_BUS);
-#endif
-               if (i2c_read(addr[0], offset, alen - 1, buffer, len))
-                       rcode = 1;
-#endif
+               rcode = eeprom_rw_block(offset, addr, alen, buffer, len, 1);
+
                buffer += len;
                offset += len;
        }
@@ -197,17 +218,8 @@ int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cn
                        len = maxlen;
 #endif
 
-#if defined(CONFIG_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
-               spi_write (addr, alen, buffer, len);
-#else
+               rcode = eeprom_rw_block(offset, addr, alen, buffer, len, 0);
 
-#if defined(CONFIG_SYS_I2C_EEPROM_BUS)
-               i2c_set_bus_num(CONFIG_SYS_I2C_EEPROM_BUS);
-#endif
-               if (i2c_write(addr[0], offset, alen - 1, buffer, len))
-                       rcode = 1;
-
-#endif
                buffer += len;
                offset += len;