Commit 4e01f3a8 authored by Jean Sacren's avatar Jean Sacren Committed by Jeff Kirsher

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: default avatarJean Sacren <sakiwit@gmail.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 08c99129
...@@ -1199,13 +1199,13 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1199,13 +1199,13 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
hw->phy_addr = i; hw->phy_addr = i;
e1000_read_phy_reg(hw, PHY_ID2, &tmp); e1000_read_phy_reg(hw, PHY_ID2, &tmp);
if (tmp == 0 || tmp == 0xFF) {
if (i == 31) if (tmp != 0 && tmp != 0xFF)
goto err_eeprom;
continue;
} else
break; break;
} }
if (i >= 32)
goto err_eeprom;
} }
/* reset the hardware with the new settings */ /* reset the hardware with the new settings */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment