OSDN Git Service

net: ethernet: ti: cpsw: remove dual check from common res usage function
authorIvan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Thu, 19 Jan 2017 16:58:23 +0000 (18:58 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Jan 2017 17:35:09 +0000 (12:35 -0500)
Common res usage is possible only in case an interface is
running. In case of not dual emac here can be only one interface,
so while ndo_open and switch mode, only one interface can be opened,
thus if open is called no any interface is running ... and no common
res are used. So remove check on dual emac, it will simplify
code/understanding and will match the name it's called.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/cpsw.c

index 02b03ee..296ddf2 100644 (file)
@@ -1240,9 +1240,6 @@ static int cpsw_common_res_usage_state(struct cpsw_common *cpsw)
        u32 i;
        u32 usage_count = 0;
 
        u32 i;
        u32 usage_count = 0;
 
-       if (!cpsw->data.dual_emac)
-               return 0;
-
        for (i = 0; i < cpsw->data.slaves; i++)
                if (cpsw->slaves[i].open_stat)
                        usage_count++;
        for (i = 0; i < cpsw->data.slaves; i++)
                if (cpsw->slaves[i].open_stat)
                        usage_count++;