aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-17 20:08:41 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-17 20:08:41 -0400
commit03746b0a02d25866a29cd8d7306d221c238d6397 (patch)
tree5755b26e885be0cabb9af480f60801e4317ad9ab
parent9365f11a5321bcff5579799a071a70c5cacb5e65 (diff)
be2net: Fix unused-but-set variables.
The variables 'tx_min' and 'tx_max' are set but not used in be_set_coalesce(). Similarly for 'region' in be_do_flash(). Just kill them off. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/benet/be_ethtool.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 80226e4801f3..0f645a92bebe 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -205,9 +205,9 @@ be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)
205 struct be_rx_obj *rxo; 205 struct be_rx_obj *rxo;
206 struct be_eq_obj *rx_eq; 206 struct be_eq_obj *rx_eq;
207 struct be_eq_obj *tx_eq = &adapter->tx_eq; 207 struct be_eq_obj *tx_eq = &adapter->tx_eq;
208 u32 tx_max, tx_min, tx_cur;
209 u32 rx_max, rx_min, rx_cur; 208 u32 rx_max, rx_min, rx_cur;
210 int status = 0, i; 209 int status = 0, i;
210 u32 tx_cur;
211 211
212 if (coalesce->use_adaptive_tx_coalesce == 1) 212 if (coalesce->use_adaptive_tx_coalesce == 1)
213 return -EINVAL; 213 return -EINVAL;
@@ -246,8 +246,6 @@ be_set_coalesce(struct net_device *netdev, struct ethtool_coalesce *coalesce)
246 } 246 }
247 } 247 }
248 248
249 tx_max = coalesce->tx_coalesce_usecs_high;
250 tx_min = coalesce->tx_coalesce_usecs_low;
251 tx_cur = coalesce->tx_coalesce_usecs; 249 tx_cur = coalesce->tx_coalesce_usecs;
252 250
253 if (tx_cur > BE_MAX_EQD) 251 if (tx_cur > BE_MAX_EQD)
@@ -664,11 +662,9 @@ be_do_flash(struct net_device *netdev, struct ethtool_flash *efl)
664{ 662{
665 struct be_adapter *adapter = netdev_priv(netdev); 663 struct be_adapter *adapter = netdev_priv(netdev);
666 char file_name[ETHTOOL_FLASH_MAX_FILENAME]; 664 char file_name[ETHTOOL_FLASH_MAX_FILENAME];
667 u32 region;
668 665
669 file_name[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0; 666 file_name[ETHTOOL_FLASH_MAX_FILENAME - 1] = 0;
670 strcpy(file_name, efl->data); 667 strcpy(file_name, efl->data);
671 region = efl->region;
672 668
673 return be_load_fw(adapter, file_name); 669 return be_load_fw(adapter, file_name);
674} 670}