Commit 4e01f3a8 authored Sep 19, 2015 by Jean Sacren Committed by Jeff Kirsher Dec 12, 2015

e1000: clean up the checking logic



The checking logic needed some clean-up work, so we rewrite it by
checking for break first. With that change in place, we can even move
the second check for goto statement outside of the loop.

As this is merely a cleanup, no functional change is involved. The
questionable 'tmp != 0xFF' is intentionally left alone.

Mark Rustad and Alexander Duyck contributed to this patch.

CC: Mark Rustad <mark.d.rustad@intel.com>
CC: Alex Duyck <aduyck@mirantis.com>
Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 08c99129

drivers/net/ethernet/intel/e1000/e1000_main.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1199,13 +1199,13 @@ static int e1000_probe(struct pci_dev pdev, const struct pci_device_id ent)
		for (i = 0; i < 32; i++) {
		hw->phy_addr = i;
		e1000_read_phy_reg(hw, PHY_ID2, &tmp);
		if (tmp == 0 \|\| tmp == 0xFF) {
		if (i == 31)
		goto err_eeprom;
		continue;
		} else

		if (tmp != 0 && tmp != 0xFF)
		break;
		}

		if (i >= 32)
		goto err_eeprom;
		}

		/* reset the hardware with the new settings */