openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

sfc: Removed casts to void 

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Ben Hutchings 2008-05-16 21:14:27 +01:00 committed by Jeff Garzik
parent 4cc58bdebf
commit 91ad757c2f
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/sfc/efx.c
View File

@ -265,7 +265,7 @@ void efx_process_channel_now(struct efx_channel *channel)
napi_disable(&channel->napi_str); napi_disable(&channel->napi_str);
/* Poll the channel */ /* Poll the channel */
(void) efx_process_channel(channel, efx->type->evq_size); efx_process_channel(channel, efx->type->evq_size);
/* Ack the eventq. This may cause an interrupt to be generated /* Ack the eventq. This may cause an interrupt to be generated
* when they are reenabled */ * when they are reenabled */
@ -1688,7 +1688,7 @@ static int efx_reset(struct efx_nic *efx)
if (method == RESET_TYPE_DISABLE) { if (method == RESET_TYPE_DISABLE) {
/* Reinitialise the device anyway so the driver unload sequence /* Reinitialise the device anyway so the driver unload sequence
* can talk to the external SRAM */ * can talk to the external SRAM */
(void) falcon_init_nic(efx); falcon_init_nic(efx);
rc = -EIO; rc = -EIO;
goto fail4; goto fail4;
} }

2
drivers/net/sfc/falcon.c
View File

@ -2647,7 +2647,7 @@ void falcon_remove_nic(struct efx_nic *efx)
falcon_free_buffer(efx, &efx->irq_status); falcon_free_buffer(efx, &efx->irq_status);
(void) falcon_reset_hw(efx, RESET_TYPE_ALL); falcon_reset_hw(efx, RESET_TYPE_ALL);
/* Release the second function after the reset */ /* Release the second function after the reset */
if (nic_data->pci_dev2) { if (nic_data->pci_dev2) {

4
drivers/net/sfc/falcon_xmac.c
View File

@ -454,7 +454,7 @@ static int falcon_check_xaui_link_up(struct efx_nic *efx)
EFX_LOG(efx, "%s Clobbering XAUI (%d tries left).\n", EFX_LOG(efx, "%s Clobbering XAUI (%d tries left).\n",
__func__, tries); __func__, tries);
(void) falcon_reset_xaui(efx); falcon_reset_xaui(efx);
udelay(200); udelay(200);
tries--; tries--;
} }
@ -572,7 +572,7 @@ int falcon_check_xmac(struct efx_nic *efx)
xaui_link_ok = falcon_xaui_link_ok(efx); xaui_link_ok = falcon_xaui_link_ok(efx);
if (EFX_WORKAROUND_5147(efx) && !xaui_link_ok) if (EFX_WORKAROUND_5147(efx) && !xaui_link_ok)
(void) falcon_reset_xaui(efx); falcon_reset_xaui(efx);
/* Call the PHY check_hw routine */ /* Call the PHY check_hw routine */
rc = efx->phy_op->check_hw(efx); rc = efx->phy_op->check_hw(efx);

14
drivers/net/sfc/sfe4001.c
View File

@ -116,18 +116,18 @@ void sfe4001_poweroff(struct efx_nic *efx)
/* Turn off all power rails */ /* Turn off all power rails */
out = 0xff; out = 0xff;
(void) efx_i2c_write(i2c, PCA9539, P0_OUT, &out, 1); efx_i2c_write(i2c, PCA9539, P0_OUT, &out, 1);
/* Disable port 1 outputs on IO expander */ /* Disable port 1 outputs on IO expander */
cfg = 0xff; cfg = 0xff;
(void) efx_i2c_write(i2c, PCA9539, P1_CONFIG, &cfg, 1); efx_i2c_write(i2c, PCA9539, P1_CONFIG, &cfg, 1);
/* Disable port 0 outputs on IO expander */ /* Disable port 0 outputs on IO expander */
cfg = 0xff; cfg = 0xff;
(void) efx_i2c_write(i2c, PCA9539, P0_CONFIG, &cfg, 1); efx_i2c_write(i2c, PCA9539, P0_CONFIG, &cfg, 1);
/* Clear any over-temperature alert */ /* Clear any over-temperature alert */
(void) efx_i2c_read(i2c, MAX6647, RSL, &in, 1); efx_i2c_read(i2c, MAX6647, RSL, &in, 1);
} }
/* The P0_EN_3V3X line on SFE4001 boards (from A2 onward) is connected /* The P0_EN_3V3X line on SFE4001 boards (from A2 onward) is connected
@ -253,14 +253,14 @@ int sfe4001_poweron(struct efx_nic *efx)
fail3: fail3:
/* Turn off all power rails */ /* Turn off all power rails */
out = 0xff; out = 0xff;
(void) efx_i2c_write(i2c, PCA9539, P0_OUT, &out, 1); efx_i2c_write(i2c, PCA9539, P0_OUT, &out, 1);
/* Disable port 1 outputs on IO expander */ /* Disable port 1 outputs on IO expander */
out = 0xff; out = 0xff;
(void) efx_i2c_write(i2c, PCA9539, P1_CONFIG, &out, 1); efx_i2c_write(i2c, PCA9539, P1_CONFIG, &out, 1);
fail2: fail2:
/* Disable port 0 outputs on IO expander */ /* Disable port 0 outputs on IO expander */
out = 0xff; out = 0xff;
(void) efx_i2c_write(i2c, PCA9539, P0_CONFIG, &out, 1); efx_i2c_write(i2c, PCA9539, P0_CONFIG, &out, 1);
fail1: fail1:
return rc; return rc;
} }

2
drivers/net/sfc/tenxpress.c
View File

@ -376,7 +376,7 @@ static void tenxpress_phy_reconfigure(struct efx_nic *efx)
* perform a special software reset */ * perform a special software reset */
if ((phy_data->tx_disabled && !efx->tx_disabled) || if ((phy_data->tx_disabled && !efx->tx_disabled) ||
loop_change) { loop_change) {
(void) tenxpress_special_reset(efx); tenxpress_special_reset(efx);
falcon_reset_xaui(efx); falcon_reset_xaui(efx);
} }