| Message ID | 1447665558-21632-3-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 140bc33e05382545b762ef51d6fc31dd5b6ec82c |
| Delegated to: | Joe Hershberger |
| Headers | show |
On Mon, Nov 16, 2015 at 3:19 AM, Bin Meng <bmeng.cn@gmail.com> wrote: > Per the comments, e1000_spi_eeprom_disable_wr() and > e1000_spi_eeprom_write_status() have been tested. > Remove the #if 0, #endif and mark them as __maybe_unused. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
On Mon, Nov 16, 2015 at 3:19 AM, Bin Meng <bmeng.cn@gmail.com> wrote: > Per the comments, e1000_spi_eeprom_disable_wr() and > e1000_spi_eeprom_write_status() have been tested. > Remove the #if 0, #endif and mark them as __maybe_unused. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Applied to u-boot-net/master, thanks! -Joe
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c index e7f6826..604ee6b 100644 --- a/drivers/net/e1000_spi.c +++ b/drivers/net/e1000_spi.c @@ -181,22 +181,21 @@ static int e1000_spi_eeprom_enable_wr(struct e1000_hw *hw, bool intr) * These have been tested to perform correctly, but they are not used by any * of the EEPROM commands at this time. */ -#if 0 -static int e1000_spi_eeprom_disable_wr(struct e1000_hw *hw, bool intr) +static __maybe_unused int e1000_spi_eeprom_disable_wr(struct e1000_hw *hw, + bool intr) { u8 op[] = { SPI_EEPROM_DISABLE_WR }; e1000_standby_eeprom(hw); return e1000_spi_xfer(hw, 8*sizeof(op), op, NULL, intr); } -static int e1000_spi_eeprom_write_status(struct e1000_hw *hw, - u8 status, bool intr) +static __maybe_unused int e1000_spi_eeprom_write_status(struct e1000_hw *hw, + u8 status, bool intr) { u8 op[] = { SPI_EEPROM_WRITE_STATUS, status }; e1000_standby_eeprom(hw); return e1000_spi_xfer(hw, 8*sizeof(op), op, NULL, intr); } -#endif static int e1000_spi_eeprom_read_status(struct e1000_hw *hw, bool intr) {
Per the comments, e1000_spi_eeprom_disable_wr() and e1000_spi_eeprom_write_status() have been tested. Remove the #if 0, #endif and mark them as __maybe_unused. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- drivers/net/e1000_spi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)