lkml.org 
[lkml]   [2012]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/3] drivers/net/ethernet/ti/davinci_xxx.c: Move call to PTR_ERR after reassignment
    Date
    From: Julia Lawall <julia@diku.dk>

    Delete successive assignments to the same location.

    The semantic match that finds this problem is as follows:
    (http://coccinelle.lip6.fr/)

    // <smpl>
    @@
    expression e,e1;
    constant c;
    @@

    *e = c
    ... when != e = e1
    when != &e
    when != true IS_ERR(e)
    *PTR_ERR(e)
    // </smpl>

    Signed-off-by: Julia Lawall <julia@diku.dk>
    Reported-by: Josh Triplett <josh@joshtriplett.org>

    ---
    drivers/net/ethernet/ti/davinci_emac.c | 3 ++-
    drivers/net/ethernet/ti/davinci_mdio.c | 2 +-
    2 files changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c
    index efd4f3e..922a937 100644
    --- a/drivers/net/ethernet/ti/davinci_emac.c
    +++ b/drivers/net/ethernet/ti/davinci_emac.c
    @@ -1600,8 +1600,9 @@ static int emac_dev_open(struct net_device *ndev)
    if (IS_ERR(priv->phydev)) {
    dev_err(emac_dev, "could not connect to phy %s\n",
    priv->phy_id);
    + ret = PTR_ERR(priv->phydev);
    priv->phydev = NULL;
    - return PTR_ERR(priv->phydev);
    + return ret;
    }

    priv->link = 0;
    diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
    index ef7c9c1..af8b8fc 100644
    --- a/drivers/net/ethernet/ti/davinci_mdio.c
    +++ b/drivers/net/ethernet/ti/davinci_mdio.c
    @@ -318,9 +318,9 @@ static int __devinit davinci_mdio_probe(struct platform_device *pdev)

    data->clk = clk_get(dev, NULL);
    if (IS_ERR(data->clk)) {
    - data->clk = NULL;
    dev_err(dev, "failed to get device clock\n");
    ret = PTR_ERR(data->clk);
    + data->clk = NULL;
    goto bail_out;
    }



    \
     
     \ /
      Last update: 2012-02-02 15:03    [W:0.032 / U:0.036 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site