diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2013-03-09 03:16:46 -0500 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2013-04-02 01:06:03 -0400 |
| commit | bf51a8c5e0b6133b929eb7d7456e99a605f8168c (patch) | |
| tree | 5b592f4c92618ae074af18afee0ff1ad269177d3 /drivers/net/ethernet/sfc/falcon.c | |
| parent | f5fb0822957b914ab7022cc4bfe000ec3bc9c82c (diff) | |
i2c: Ignore return value of i2c_del_adapter()
i2c_del_adapter() always returns 0. So all checks testing whether it will be
non zero will always evaluate to false and the conditional code is dead code.
This patch updates all callers of i2c_del_mux_adapter() to ignore the return
value and assume that it will always succeed (which it will). In a subsequent
patch the return type of i2c_del_adapter() will be made void.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Reviewed-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/net/ethernet/sfc/falcon.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/falcon.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c index 49bcd196e10d..defed0eda820 100644 --- a/drivers/net/ethernet/sfc/falcon.c +++ b/drivers/net/ethernet/sfc/falcon.c | |||
| @@ -1528,7 +1528,7 @@ static int falcon_probe_nic(struct efx_nic *efx) | |||
| 1528 | return 0; | 1528 | return 0; |
| 1529 | 1529 | ||
| 1530 | fail6: | 1530 | fail6: |
| 1531 | BUG_ON(i2c_del_adapter(&board->i2c_adap)); | 1531 | i2c_del_adapter(&board->i2c_adap); |
| 1532 | memset(&board->i2c_adap, 0, sizeof(board->i2c_adap)); | 1532 | memset(&board->i2c_adap, 0, sizeof(board->i2c_adap)); |
| 1533 | fail5: | 1533 | fail5: |
| 1534 | efx_nic_free_buffer(efx, &efx->irq_status); | 1534 | efx_nic_free_buffer(efx, &efx->irq_status); |
| @@ -1665,13 +1665,11 @@ static void falcon_remove_nic(struct efx_nic *efx) | |||
| 1665 | { | 1665 | { |
| 1666 | struct falcon_nic_data *nic_data = efx->nic_data; | 1666 | struct falcon_nic_data *nic_data = efx->nic_data; |
| 1667 | struct falcon_board *board = falcon_board(efx); | 1667 | struct falcon_board *board = falcon_board(efx); |
| 1668 | int rc; | ||
| 1669 | 1668 | ||
| 1670 | board->type->fini(efx); | 1669 | board->type->fini(efx); |
| 1671 | 1670 | ||
| 1672 | /* Remove I2C adapter and clear it in preparation for a retry */ | 1671 | /* Remove I2C adapter and clear it in preparation for a retry */ |
| 1673 | rc = i2c_del_adapter(&board->i2c_adap); | 1672 | i2c_del_adapter(&board->i2c_adap); |
| 1674 | BUG_ON(rc); | ||
| 1675 | memset(&board->i2c_adap, 0, sizeof(board->i2c_adap)); | 1673 | memset(&board->i2c_adap, 0, sizeof(board->i2c_adap)); |
| 1676 | 1674 | ||
| 1677 | efx_nic_free_buffer(efx, &efx->irq_status); | 1675 | efx_nic_free_buffer(efx, &efx->irq_status); |