Commit 67ec2f80 authored by John W. Linville's avatar John W. Linville Committed by Jeff Garzik

[PATCH] sundance: remove if (1) { ... } block in sundance_probe1

Remove an if (1) { ... } block in sundance_probe1.  Its purpose seems
to be only to allow for delaring some extra local variables.  But, it also
adds ugly indentation without adding any meaning to the code.
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 36841c9d
...@@ -518,6 +518,7 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev, ...@@ -518,6 +518,7 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
#else #else
int bar = 1; int bar = 1;
#endif #endif
int phy, phy_idx = 0;
/* when built into the kernel, we only print version if device is found */ /* when built into the kernel, we only print version if device is found */
...@@ -606,8 +607,6 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev, ...@@ -606,8 +607,6 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
printk("%2.2x:", dev->dev_addr[i]); printk("%2.2x:", dev->dev_addr[i]);
printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], irq); printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], irq);
if (1) {
int phy, phy_idx = 0;
np->phys[0] = 1; /* Default setting */ np->phys[0] = 1; /* Default setting */
np->mii_preamble_required++; np->mii_preamble_required++;
for (phy = 1; phy < 32 && phy_idx < MII_CNT; phy++) { for (phy = 1; phy < 32 && phy_idx < MII_CNT; phy++) {
...@@ -631,7 +630,6 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev, ...@@ -631,7 +630,6 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
} }
np->mii_if.phy_id = np->phys[0]; np->mii_if.phy_id = np->phys[0];
}
/* Parse override configuration */ /* Parse override configuration */
np->an_enable = 1; np->an_enable = 1;
......
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