From: Ivan Khoronzhuk Date: Thu, 19 Jan 2017 16:58:24 +0000 (+0200) Subject: net: ethernet: ti: cpsw: don't disable interrupts in ndo_open X-Git-Tag: MMI-PSA29.97-13-9~6152^2~361^2~3 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=176b0cbffdf3f240a19386635811034dfe0fc8ab;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git net: ethernet: ti: cpsw: don't disable interrupts in ndo_open No need to disable interrupts if no open devices, they are disabled anyway. Even no need to disable interrupts if some ndev is opened, In this case shared resources are not touched, only parameters of ndev shell, so no reason to disable them also. Removed lines have proved it. So, no need in redundant check and interrupt disable. Signed-off-by: Ivan Khoronzhuk Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 296ddf247e92..f79890546d96 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1480,8 +1480,6 @@ static int cpsw_ndo_open(struct net_device *ndev) return ret; } - if (!cpsw_common_res_usage_state(cpsw)) - cpsw_intr_disable(cpsw); netif_carrier_off(ndev); /* Notify the stack of the actual queue counts. */