diff options
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
-rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 5db7d4e27ec0..57fc199e0614 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
@@ -793,7 +793,7 @@ release_tpsram: | |||
793 | */ | 793 | */ |
794 | static int cxgb_up(struct adapter *adap) | 794 | static int cxgb_up(struct adapter *adap) |
795 | { | 795 | { |
796 | int err = 0; | 796 | int err; |
797 | int must_load; | 797 | int must_load; |
798 | 798 | ||
799 | if (!(adap->flags & FULL_INIT_DONE)) { | 799 | if (!(adap->flags & FULL_INIT_DONE)) { |
@@ -907,7 +907,7 @@ static int offload_open(struct net_device *dev) | |||
907 | struct adapter *adapter = pi->adapter; | 907 | struct adapter *adapter = pi->adapter; |
908 | struct t3cdev *tdev = dev2t3cdev(dev); | 908 | struct t3cdev *tdev = dev2t3cdev(dev); |
909 | int adap_up = adapter->open_device_map & PORT_MASK; | 909 | int adap_up = adapter->open_device_map & PORT_MASK; |
910 | int err = 0; | 910 | int err; |
911 | 911 | ||
912 | if (test_and_set_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map)) | 912 | if (test_and_set_bit(OFFLOAD_DEVMAP_BIT, &adapter->open_device_map)) |
913 | return 0; | 913 | return 0; |
@@ -1566,7 +1566,7 @@ static int set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, | |||
1566 | struct adapter *adapter = pi->adapter; | 1566 | struct adapter *adapter = pi->adapter; |
1567 | u32 aligned_offset, aligned_len, *p; | 1567 | u32 aligned_offset, aligned_len, *p; |
1568 | u8 *buf; | 1568 | u8 *buf; |
1569 | int err = 0; | 1569 | int err; |
1570 | 1570 | ||
1571 | if (eeprom->magic != EEPROM_MAGIC) | 1571 | if (eeprom->magic != EEPROM_MAGIC) |
1572 | return -EINVAL; | 1572 | return -EINVAL; |