diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2015-11-16 01:19:18 -0800 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2015-12-21 20:01:57 -0600 |
| commit | 140bc33e05382545b762ef51d6fc31dd5b6ec82c (patch) | |
| tree | 28944581ae991cd0cc892892ade812e50003cd11 /drivers/net | |
| parent | c65a5f4f7f50ad2e8ed0d0963eb238551c5d6b65 (diff) | |
| download | talos-obmc-uboot-140bc33e05382545b762ef51d6fc31dd5b6ec82c.tar.gz talos-obmc-uboot-140bc33e05382545b762ef51d6fc31dd5b6ec82c.zip | |
net: e1000: Mark _disable_wr() and _write_status() as __maybe_unused
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/e1000_spi.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/e1000_spi.c b/drivers/net/e1000_spi.c index df72375238..576ddb8b24 100644 --- a/drivers/net/e1000_spi.c +++ b/drivers/net/e1000_spi.c @@ -182,22 +182,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) { |
