|
@@ -5286,19 +5286,15 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
|
|
|
if (readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_PHY_INIT) {
|
|
|
np->mac_in_use = readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_MGMT_ST;
|
|
|
dprintk(KERN_INFO "%s: mgmt unit is running. mac in use %x.\n", pci_name(pci_dev), np->mac_in_use);
|
|
|
- for (i = 0; i < 5000; i++) {
|
|
|
- msleep(1);
|
|
|
- if (nv_mgmt_acquire_sema(dev)) {
|
|
|
- /* management unit setup the phy already? */
|
|
|
- if ((readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_MASK) ==
|
|
|
- NVREG_XMITCTL_SYNC_PHY_INIT) {
|
|
|
- /* phy is inited by mgmt unit */
|
|
|
- phyinitialized = 1;
|
|
|
- dprintk(KERN_INFO "%s: Phy already initialized by mgmt unit.\n", pci_name(pci_dev));
|
|
|
- } else {
|
|
|
- /* we need to init the phy */
|
|
|
- }
|
|
|
- break;
|
|
|
+ if (nv_mgmt_acquire_sema(dev)) {
|
|
|
+ /* management unit setup the phy already? */
|
|
|
+ if ((readl(base + NvRegTransmitterControl) & NVREG_XMITCTL_SYNC_MASK) ==
|
|
|
+ NVREG_XMITCTL_SYNC_PHY_INIT) {
|
|
|
+ /* phy is inited by mgmt unit */
|
|
|
+ phyinitialized = 1;
|
|
|
+ dprintk(KERN_INFO "%s: Phy already initialized by mgmt unit.\n", pci_name(pci_dev));
|
|
|
+ } else {
|
|
|
+ /* we need to init the phy */
|
|
|
}
|
|
|
}
|
|
|
}
|