| Message ID | 1447185213-5799-5-git-send-email-marex@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
Hello Marek, Am 10.11.2015 um 20:53 schrieb Marek Vasut: > Remove this function as it's no longer used. > > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Tom Rini <trini@konsulko.com> > Cc: Simon Glass <sjg@chromium.org> > Cc: Heiko Schocher <hs@denx.de> > --- > common/cmd_eeprom.c | 19 ------------------- > include/common.h | 3 --- > 2 files changed, 22 deletions(-) Reviewed-by: Heiko Schocher <hs@denx.de> bye, Heiko > > diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c > index 266f954..ea1d447 100644 > --- a/common/cmd_eeprom.c > +++ b/common/cmd_eeprom.c > @@ -221,25 +221,6 @@ int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cn > return rcode; > } > > -#if !defined(CONFIG_SPI) || defined(CONFIG_ENV_EEPROM_IS_ON_I2C) > -int eeprom_probe(unsigned dev_addr, unsigned offset) > -{ > - unsigned char chip; > - > - /* Probe the chip address > - */ > -#if CONFIG_SYS_I2C_EEPROM_ADDR_LEN == 1 && !defined(CONFIG_SPI_X) > - chip = offset >> 8; /* block number */ > -#else > - chip = offset >> 16; /* block number */ > -#endif /* CONFIG_SYS_I2C_EEPROM_ADDR_LEN, CONFIG_SPI_X */ > - > - chip |= dev_addr; /* insert device address */ > - > - return (i2c_probe (chip)); > -} > -#endif > - > static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) > { > const char *const fmt = > diff --git a/include/common.h b/include/common.h > index 09a131d..ceb1ad3 100644 > --- a/include/common.h > +++ b/include/common.h > @@ -476,9 +476,6 @@ void fdc_hw_init (void); > > /* $(BOARD)/eeprom.c */ > void eeprom_init (void); > -#ifndef CONFIG_SPI > -int eeprom_probe (unsigned dev_addr, unsigned offset); > -#endif > int eeprom_read (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt); > int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt); > >
On Tue, Nov 10, 2015 at 08:53:21PM +0100, Marek Vasut wrote: > Remove this function as it's no longer used. > > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Tom Rini <trini@konsulko.com> > Cc: Simon Glass <sjg@chromium.org> > Cc: Heiko Schocher <hs@denx.de> > Reviewed-by: Heiko Schocher <hs@denx.de> Applied to u-boot/master, thanks!
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c index 266f954..ea1d447 100644 --- a/common/cmd_eeprom.c +++ b/common/cmd_eeprom.c @@ -221,25 +221,6 @@ int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cn return rcode; } -#if !defined(CONFIG_SPI) || defined(CONFIG_ENV_EEPROM_IS_ON_I2C) -int eeprom_probe(unsigned dev_addr, unsigned offset) -{ - unsigned char chip; - - /* Probe the chip address - */ -#if CONFIG_SYS_I2C_EEPROM_ADDR_LEN == 1 && !defined(CONFIG_SPI_X) - chip = offset >> 8; /* block number */ -#else - chip = offset >> 16; /* block number */ -#endif /* CONFIG_SYS_I2C_EEPROM_ADDR_LEN, CONFIG_SPI_X */ - - chip |= dev_addr; /* insert device address */ - - return (i2c_probe (chip)); -} -#endif - static int do_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { const char *const fmt = diff --git a/include/common.h b/include/common.h index 09a131d..ceb1ad3 100644 --- a/include/common.h +++ b/include/common.h @@ -476,9 +476,6 @@ void fdc_hw_init (void); /* $(BOARD)/eeprom.c */ void eeprom_init (void); -#ifndef CONFIG_SPI -int eeprom_probe (unsigned dev_addr, unsigned offset); -#endif int eeprom_read (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt); int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt);
Remove this function as it's no longer used. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Tom Rini <trini@konsulko.com> Cc: Simon Glass <sjg@chromium.org> Cc: Heiko Schocher <hs@denx.de> --- common/cmd_eeprom.c | 19 ------------------- include/common.h | 3 --- 2 files changed, 22 deletions(-)