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>
Orabug: 26243014
(cherry picked from commit 4e01f3a802b5910b25814e1d0fd05907edffed6f)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Ethan Zhao <ethan.zhao@oracle.com>

diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index fb55b98c6306c6d3ca17e6f208fa1836e2665a80..0ceb9877d6876cb52c82eb8412501c1b8033c920 100644 (file)
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -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 */