From patchwork Sun Jan 8 16:41:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 9503525 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1B03A6071A for ; Sun, 8 Jan 2017 16:42:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 057E827F88 for ; Sun, 8 Jan 2017 16:42:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EB54F2832F; Sun, 8 Jan 2017 16:42:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E9ED27F88 for ; Sun, 8 Jan 2017 16:42:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753413AbdAHQlV (ORCPT ); Sun, 8 Jan 2017 11:41:21 -0500 Received: from mail-lf0-f41.google.com ([209.85.215.41]:34185 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753968AbdAHQlM (ORCPT ); Sun, 8 Jan 2017 11:41:12 -0500 Received: by mail-lf0-f41.google.com with SMTP id v186so27263750lfa.1 for ; Sun, 08 Jan 2017 08:41:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zaqQQ37/4K9t16jRXqU4K4Gos2opn6jWsLFcU8K4YZE=; b=kYvkToJ/5itEJYuUXIr6yjaqTEIHVcCPJ1M3L9CrC9awen9yStFwF/V/4SizX6PX96 H7Hq3n4nBA+s3quy9tvXwShbFUZyGM/GYobq2tgsrZ5srNiwOqp5dS1z5X4tGVBRQvzi ROUyHAg6jRSjf3S9+JFef45GLwgHDnj7vNCyQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zaqQQ37/4K9t16jRXqU4K4Gos2opn6jWsLFcU8K4YZE=; b=E1VIR7MqUXGruYZLU8xVAvDsx8djQ3eXAOGS7gJx1pB3+GOAXqUZgO+AMjuLzwRl4n PVHDyRCEFDW/3pf1tqYP8f1NPDhacmWDZzzngST+APaq68uFbfhsE7xCtxzpbAeXYtu0 7bCUdYeXuY1KzqmQa3T5c3MnLxDmnBEBExBHt1lEHWgqfnpl8/+BedYifQ2B0yNqZL9x IGjKBOSYJCCRSwTAPrEJYTX2waFxHWaT/FZqJXilEPDr0q3LsxqETt1IN1lB6P8WLBrZ WaYdhFM627WtCY/rcEoQJzMp0b7nyPgU7EC+5rZwk2qQausnUgRLibVtzM1/q+xNYrve 5Qlw== X-Gm-Message-State: AIkVDXKbx9gmEKS3qAIbfBfc0VaA/+2JoFzpnkitHwR8PlOul200Sqj5ECHnz66BZlFwjGto X-Received: by 10.46.74.26 with SMTP id x26mr28835230lja.51.1483893670598; Sun, 08 Jan 2017 08:41:10 -0800 (PST) Received: from localhost.localdomain (183-224-132-95.pool.ukrtel.net. [95.132.224.183]) by smtp.gmail.com with ESMTPSA id c77sm20196895lfg.29.2017.01.08.08.41.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Jan 2017 08:41:10 -0800 (PST) From: Ivan Khoronzhuk To: netdev@vger.kernel.org, mugunthanvnm@ti.com Cc: linux-omap@vger.kernel.org, grygorii.strashko@ti.com, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH 3/4] net: ethernet: ti: cpsw: don't duplicate ndev_running Date: Sun, 8 Jan 2017 18:41:02 +0200 Message-Id: <1483893663-15673-4-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483893663-15673-1-git-send-email-ivan.khoronzhuk@linaro.org> References: <1483893663-15673-1-git-send-email-ivan.khoronzhuk@linaro.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP No need to create additional vars to identify if interface is running. So simplify code by removing redundant var and checking usage counter instead. Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 40d7fc9..daae87f 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -357,7 +357,6 @@ struct cpsw_slave { struct phy_device *phy; struct net_device *ndev; u32 port_vlan; - u32 open_stat; }; static inline u32 slave_read(struct cpsw_slave *slave, u32 offset) @@ -1241,7 +1240,7 @@ static int cpsw_common_res_usage_state(struct cpsw_common *cpsw) u32 usage_count = 0; for (i = 0; i < cpsw->data.slaves; i++) - if (cpsw->slaves[i].open_stat) + if (netif_running(cpsw->slaves[i].ndev)) usage_count++; return usage_count; @@ -1502,7 +1501,7 @@ static int cpsw_ndo_open(struct net_device *ndev) CPSW_RTL_VERSION(reg)); /* initialize host and slave ports */ - if (!cpsw_common_res_usage_state(cpsw)) + if (cpsw_common_res_usage_state(cpsw) < 2) cpsw_init_host_port(priv); for_each_slave(priv, cpsw_slave_open, priv); @@ -1513,7 +1512,7 @@ static int cpsw_ndo_open(struct net_device *ndev) cpsw_ale_add_vlan(cpsw->ale, cpsw->data.default_vlan, ALE_ALL_PORTS, ALE_ALL_PORTS, 0, 0); - if (!cpsw_common_res_usage_state(cpsw)) { + if (cpsw_common_res_usage_state(cpsw) < 2) { /* disable priority elevation */ __raw_writel(0, &cpsw->regs->ptype); @@ -1556,9 +1555,6 @@ static int cpsw_ndo_open(struct net_device *ndev) cpdma_ctlr_start(cpsw->dma); cpsw_intr_enable(cpsw); - if (cpsw->data.dual_emac) - cpsw->slaves[priv->emac_port].open_stat = true; - return 0; err_cleanup: @@ -1578,7 +1574,7 @@ static int cpsw_ndo_stop(struct net_device *ndev) netif_tx_stop_all_queues(priv->ndev); netif_carrier_off(priv->ndev); - if (cpsw_common_res_usage_state(cpsw) <= 1) { + if (!cpsw_common_res_usage_state(cpsw)) { napi_disable(&cpsw->napi_rx); napi_disable(&cpsw->napi_tx); cpts_unregister(cpsw->cpts); @@ -1592,8 +1588,6 @@ static int cpsw_ndo_stop(struct net_device *ndev) cpsw_split_res(ndev); pm_runtime_put_sync(cpsw->dev); - if (cpsw->data.dual_emac) - cpsw->slaves[priv->emac_port].open_stat = false; return 0; }