lkml.org 
[lkml]   [2007]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[M68KNOMMU]: improve code formating FEC driver
    From: Philippe De Muyter <phdm@macqel.be>

    Indent all the `else' the same way.
    Remove some unecesary white space.

    Signed-off-by: Philippe De Muyter <phdm@macqel.be>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
    ---


    diff -Naurp linux-2.6.23/drivers/net/fec.c linux-2.6.23-uc0/drivers/net/fec.c
    --- linux-2.6.23/drivers/net/fec.c 2007-10-19 10:25:49.000000000 +1000
    +++ linux-2.6.23-uc0/drivers/net/fec.c 2007-10-19 10:34:22.000000000 +1000
    @@ -753,13 +753,11 @@ mii_queue(struct net_device *dev, int re
    if (mii_head) {
    mii_tail->mii_next = mip;
    mii_tail = mip;
    - }
    - else {
    + } else {
    mii_head = mii_tail = mip;
    fep->hwp->fec_mii_data = regval;
    }
    - }
    - else {
    + } else {
    retval = 1;
    }

    @@ -794,7 +789,6 @@ static void mii_parse_sr(uint mii_reg, s
    status |= PHY_STAT_FAULT;
    if (mii_reg & 0x0020)
    status |= PHY_STAT_ANC;
    -
    *s = status;
    }

    @@ -1241,7 +1235,6 @@ mii_link_interrupt(int irq, void * dev_i
    #endif

    #if defined(CONFIG_M5272)
    -
    /*
    * Code specific to Coldfire 5272 setup.
    */
    @@ -2022,8 +2015,7 @@ static void mii_relink(struct work_struc
    & (PHY_STAT_100FDX | PHY_STAT_10FDX))
    duplex = 1;
    fec_restart(dev, duplex);
    - }
    - else
    + } else
    fec_stop(dev);

    #if 0
    @@ -2121,8 +2113,7 @@ mii_discover_phy(uint mii_reg, struct ne
    fep->phy_id = phytype << 16;
    mii_queue(dev, mk_mii_read(MII_REG_PHYIR2),
    mii_discover_phy3);
    - }
    - else {
    + } else {
    fep->phy_addr++;
    mii_queue(dev, mk_mii_read(MII_REG_PHYIR1),
    mii_discover_phy);
    @@ -2584,8 +2575,7 @@ fec_restart(struct net_device *dev, int
    if (duplex) {
    fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x04;/* MII enable */
    fecp->fec_x_cntrl = 0x04; /* FD enable */
    - }
    - else {
    + } else {
    /* MII enable|No Rcv on Xmit */
    fecp->fec_r_cntrl = OPT_FRAME_SIZE | 0x06;
    fecp->fec_x_cntrl = 0x00;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-10-19 05:51    [W:0.021 / U:0.112 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site