From patchwork Tue Aug 9 23:22:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 73578 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp127697qga; Tue, 9 Aug 2016 16:23:57 -0700 (PDT) X-Received: by 10.98.11.133 with SMTP id 5mr1566912pfl.160.1470785037724; Tue, 09 Aug 2016 16:23:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f5si23283297pas.31.2016.08.09.16.23.57; Tue, 09 Aug 2016 16:23:57 -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 S932724AbcHIXXa (ORCPT + 27 others); Tue, 9 Aug 2016 19:23:30 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:37892 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932572AbcHIXX0 (ORCPT ); Tue, 9 Aug 2016 19:23:26 -0400 Received: by mail-wm0-f42.google.com with SMTP id o80so66905288wme.1 for ; Tue, 09 Aug 2016 16:23:25 -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=9WS9/pi6V3hi7I9q2H0NnHtjFV7U2k/qhbZZe1xLuO8=; b=eYaPaqru0m2YIyAU0pjLBFv7ftXBHn5a3UC9FE8V63SepT6tyWXak6i0m3jjo9zf0b RNSWkH6Dwg41kuopQ1w7GwP1eY24A2aDkfGWzUtd9zfBNrOA9Ifp1GsANPDQg3AAx0GN H6YTFfDFAjFyS8mJtWOTIOTmbCIFDiyu0lYGA= 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=9WS9/pi6V3hi7I9q2H0NnHtjFV7U2k/qhbZZe1xLuO8=; b=l8z9Ije7FHcl1mhOfO2EYCr2SJQ9dEOTWH+3dgcJ7CQqgtQ7QounXA6SMy0xfiljuN wPdWHpmn9HlJssXybNgopqNb49rTQqBmZgRKV9xmLq6wdTfR00MwWnSUdIhjIeDCIY5l Psa8YzjabgIKTgfw4kaBHbZmTTFwkWqB5w0+pTEd42xcouivZkidt+mgFjiaxoreguvX qsQDqdxYyYKx/wBzVYWelIUFDTjd2wvxEE7IlPmNDrXvUyoBtwEjkVKDBiNu9CIrMxya 6ucIK68Y4hn8ml0R89wdS8PZf6DW9TG2M664npI9MZIOqHrOIPJahLBvK7LkQ7kxEmfQ V3uA== X-Gm-Message-State: AEkoousMKaq3+kBMRU3HobX0FUKANFgJVHNydbAtswZIme5bsK9F5WreqzYDQJcBDyoDJfVu X-Received: by 10.25.87.2 with SMTP id l2mr128336lfb.170.1470785004705; Tue, 09 Aug 2016 16:23:24 -0700 (PDT) Received: from localhost.localdomain (88-203-94-178.pool.ukrtel.net. [178.94.203.88]) by smtp.gmail.com with ESMTPSA id s2sm904627lja.35.2016.08.09.16.23.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Aug 2016 16:23:24 -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 v3 01/13] net: ethernet: ti: cpsw: simplify submit routine Date: Wed, 10 Aug 2016 02:22:32 +0300 Message-Id: <1470784964-26440-2-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1470784964-26440-1-git-send-email-ivan.khoronzhuk@linaro.org> References: <1470784964-26440-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. Reviewed-by: Mugunthan V N Reviewed-by: Grygorii Strashko 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;