Sfoglia il codice sorgente

[BNX2]: simplify parameter checks in bnx2_{get,set}_eeprom

Remove the superfluous parameter checking in bnx2_{get,set}_eeprom.
The parameters are already validated in ethtool_{get,set}_eeprom.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
John W. Linville 19 anni fa
parent
commit
1064e944d0
1 ha cambiato i file con 2 aggiunte e 10 eliminazioni
  1. 2 10
      drivers/net/bnx2.c

+ 2 - 10
drivers/net/bnx2.c

@@ -4800,11 +4800,7 @@ bnx2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
   	struct bnx2 *bp = dev->priv;
   	struct bnx2 *bp = dev->priv;
 	int rc;
 	int rc;
 
 
-	if (eeprom->offset > bp->flash_info->total_size)
-		return -EINVAL;
-
-	if ((eeprom->offset + eeprom->len) > bp->flash_info->total_size)
-		eeprom->len = bp->flash_info->total_size - eeprom->offset;
+	/* parameters already validated in ethtool_get_eeprom */
 
 
 	rc = bnx2_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
 	rc = bnx2_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
 
 
@@ -4818,11 +4814,7 @@ bnx2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom,
   	struct bnx2 *bp = dev->priv;
   	struct bnx2 *bp = dev->priv;
 	int rc;
 	int rc;
 
 
-	if (eeprom->offset > bp->flash_info->total_size)
-		return -EINVAL;
-
-	if ((eeprom->offset + eeprom->len) > bp->flash_info->total_size)
-		eeprom->len = bp->flash_info->total_size - eeprom->offset;
+	/* parameters already validated in ethtool_set_eeprom */
 
 
 	rc = bnx2_nvram_write(bp, eeprom->offset, eebuf, eeprom->len);
 	rc = bnx2_nvram_write(bp, eeprom->offset, eebuf, eeprom->len);