From patchwork Sat Aug 6 10:48:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 73391 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp2537074qga; Sat, 6 Aug 2016 14:28:02 -0700 (PDT) X-Received: by 10.66.181.139 with SMTP id dw11mr149435957pac.2.1470518882169; Sat, 06 Aug 2016 14:28:02 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ba3si27938288pab.87.2016.08.06.14.28.01; Sat, 06 Aug 2016 14:28:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752056AbcHFV17 (ORCPT + 27 others); Sat, 6 Aug 2016 17:27:59 -0400 Received: from mail-lf0-f51.google.com ([209.85.215.51]:35261 "EHLO mail-lf0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750969AbcHFV16 (ORCPT ); Sat, 6 Aug 2016 17:27:58 -0400 Received: by mail-lf0-f51.google.com with SMTP id f93so224620047lfi.2 for ; Sat, 06 Aug 2016 14:27:57 -0700 (PDT) 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=fVi+lXO/Zz5aqJXoh6qUxwJGzevzn1AlonqcD9ox5k4=; b=azvTFrS66T1jY54bGL1ABXQYNQ4fxFKQXqUNquohMIY0KpAbIe0KNe3zJCHN8EMGpO Rf09YzHALTOYVZjeDAx2A43M3nasqiBTBsybeO/CH3Cvyvc6cdAnC+MesNr1FxF10LOJ TX0LudOcFWGAHjJ+oU4cf/yYD4vUWHzWjF3pQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fVi+lXO/Zz5aqJXoh6qUxwJGzevzn1AlonqcD9ox5k4=; b=Gms8B7lHj8dKluPKML+DQ7g5UFQrps/ktMBgjEjPL3s0RTcj4oag9audSw6ERpqL64 /yJkr0k2wvfYYq/aE8uPc26FQrTA8LOySjtgY7S/z/PHDhZEoXfG232JG8lynAjmnbI3 cIdFdL3Py0OGGlM22rTX/+9PPdprtfHT2YvgAxNkFe/+Zb9ksg6c9GtM3JU7q2bcQc8G +Zip7NIj2mIyStmS9F0Ojjj9ywEt7CGnRDAWqPqdlr/hOAeO5wjn56LEPRBr2rsMNp1y mMynHxPgIjIfQwbUCVur60342CZ0Qfy7V532zr18JVaciUHxMGRjLLjQqo6w3GB3JAup epGg== X-Gm-Message-State: AEkoous4uw9hnvlZkUlFppYpeigzb9NynN2hp3DkT6y6LVRteAYjO8s6FziU48VyAoAkjrKt X-Received: by 10.25.228.203 with SMTP id x72mr1465995lfi.137.1470480539455; Sat, 06 Aug 2016 03:48:59 -0700 (PDT) Received: from localhost.localdomain (153-224-132-95.pool.ukrtel.net. [95.132.224.153]) by smtp.gmail.com with ESMTPSA id p128sm3916360lfb.32.2016.08.06.03.48.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 06 Aug 2016 03:48:58 -0700 (PDT) From: Ivan Khoronzhuk To: netdev@vger.kernel.org, mugunthanvnm@ti.com, grygorii.strashko@ti.com Cc: linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, dlide@ti.com, Ivan Khoronzhuk Subject: [PATCH v2 01/14] net: ethernet: ti: cpsw: simplify submit routine Date: Sat, 6 Aug 2016 13:48:31 +0300 Message-Id: <1470480524-6851-2-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470480524-6851-1-git-send-email-ivan.khoronzhuk@linaro.org> References: <1470480524-6851-1-git-send-email-ivan.khoronzhuk@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As second net dev is created only in case of dual_emac mode, port number can be figured out in simpler way. Also no need to pass redundant ndev struct. Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) -- 1.9.1 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index c51f346..8972bf6 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1065,19 +1065,11 @@ static int cpsw_common_res_usage_state(struct cpsw_priv *priv) return usage_count; } -static inline int cpsw_tx_packet_submit(struct net_device *ndev, - struct cpsw_priv *priv, struct sk_buff *skb) +static inline int cpsw_tx_packet_submit(struct cpsw_priv *priv, + struct sk_buff *skb) { - if (!priv->data.dual_emac) - return cpdma_chan_submit(priv->txch, skb, skb->data, - skb->len, 0); - - if (ndev == cpsw_get_slave_ndev(priv, 0)) - return cpdma_chan_submit(priv->txch, skb, skb->data, - skb->len, 1); - else - return cpdma_chan_submit(priv->txch, skb, skb->data, - skb->len, 2); + return cpdma_chan_submit(priv->txch, skb, skb->data, skb->len, + priv->emac_port + priv->data.dual_emac); } static inline void cpsw_add_dual_emac_def_ale_entries( @@ -1406,7 +1398,7 @@ static netdev_tx_t cpsw_ndo_start_xmit(struct sk_buff *skb, skb_tx_timestamp(skb); - ret = cpsw_tx_packet_submit(ndev, priv, skb); + ret = cpsw_tx_packet_submit(priv, skb); if (unlikely(ret != 0)) { cpsw_err(priv, tx_err, "desc submit failed\n"); goto fail;