Commit f909b1ef authored by Philippe De Muyter's avatar Philippe De Muyter Committed by Linus Torvalds

m68knommu: improve code formating FEC driver

Indent all the `else' the same way.
Remove some unecesary white space.
Signed-off-by: default avatarPhilippe De Muyter <phdm@macqel.be>
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7fa57a0c
...@@ -751,13 +751,11 @@ mii_queue(struct net_device *dev, int regval, void (*func)(uint, struct net_devi ...@@ -751,13 +751,11 @@ mii_queue(struct net_device *dev, int regval, void (*func)(uint, struct net_devi
if (mii_head) { if (mii_head) {
mii_tail->mii_next = mip; mii_tail->mii_next = mip;
mii_tail = mip; mii_tail = mip;
} } else {
else {
mii_head = mii_tail = mip; mii_head = mii_tail = mip;
fep->hwp->fec_mii_data = regval; fep->hwp->fec_mii_data = regval;
} }
} } else {
else {
retval = 1; retval = 1;
} }
...@@ -792,7 +790,6 @@ static void mii_parse_sr(uint mii_reg, struct net_device *dev) ...@@ -792,7 +790,6 @@ static void mii_parse_sr(uint mii_reg, struct net_device *dev)
status |= PHY_STAT_FAULT; status |= PHY_STAT_FAULT;
if (mii_reg & 0x0020) if (mii_reg & 0x0020)
status |= PHY_STAT_ANC; status |= PHY_STAT_ANC;
*s = status; *s = status;
} }
...@@ -1239,7 +1236,6 @@ mii_link_interrupt(int irq, void * dev_id); ...@@ -1239,7 +1236,6 @@ mii_link_interrupt(int irq, void * dev_id);
#endif #endif
#if defined(CONFIG_M5272) #if defined(CONFIG_M5272)
/* /*
* Code specific to Coldfire 5272 setup. * Code specific to Coldfire 5272 setup.
*/ */
...@@ -2020,8 +2016,7 @@ static void mii_relink(struct work_struct *work) ...@@ -2020,8 +2016,7 @@ static void mii_relink(struct work_struct *work)
& (PHY_STAT_100FDX | PHY_STAT_10FDX)) & (PHY_STAT_100FDX | PHY_STAT_10FDX))
duplex = 1; duplex = 1;
fec_restart(dev, duplex); fec_restart(dev, duplex);
} } else
else
fec_stop(dev); fec_stop(dev);
#if 0 #if 0
...@@ -2119,8 +2114,7 @@ mii_discover_phy(uint mii_reg, struct net_device *dev) ...@@ -2119,8 +2114,7 @@ mii_discover_phy(uint mii_reg, struct net_device *dev)
fep->phy_id = phytype << 16; fep->phy_id = phytype << 16;
mii_queue(dev, mk_mii_read(MII_REG_PHYIR2), mii_queue(dev, mk_mii_read(MII_REG_PHYIR2),
mii_discover_phy3); mii_discover_phy3);
} } else {
else {
fep->phy_addr++; fep->phy_addr++;
mii_queue(dev, mk_mii_read(MII_REG_PHYIR1), mii_queue(dev, mk_mii_read(MII_REG_PHYIR1),
mii_discover_phy); mii_discover_phy);
...@@ -2574,8 +2568,7 @@ fec_restart(struct net_device *dev, int duplex) ...@@ -2574,8 +2568,7 @@ fec_restart(struct net_device *dev, int duplex)
if (duplex) { if (duplex) {
fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x04;/* MII enable */ fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x04;/* MII enable */
fecp->fec_x_cntrl = 0x04; /* FD enable */ fecp->fec_x_cntrl = 0x04; /* FD enable */
} } else {
else {
/* MII enable|No Rcv on Xmit */ /* MII enable|No Rcv on Xmit */
fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x06; fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x06;
fecp->fec_x_cntrl = 0x00; fecp->fec_x_cntrl = 0x00;
......
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