Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1064e944 authored by John W. Linville's avatar John W. Linville Committed by David S. Miller
Browse files

[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: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b6cbc3b6

drivers/net/bnx2.c

+2 −10
Original line number Diff line number Diff line
@@ -4800,11 +4800,7 @@ bnx2_get_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, 
  	struct bnx2 *bp = dev->priv;

	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);
@@ -4818,11 +4814,7 @@ bnx2_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, 
  	struct bnx2 *bp = dev->priv;

	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);