From patchwork Tue Apr 23 13:08:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grygorii Strashko X-Patchwork-Id: 162689 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3772164jan; Tue, 23 Apr 2019 06:11:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqyqVu3AjGK1dBADtvklinUYINzQN1IopnePhL33DGlJIOuKO3vix+6+Z9BMPwCnRunT+w4W X-Received: by 2002:a62:2541:: with SMTP id l62mr4501651pfl.243.1556025090206; Tue, 23 Apr 2019 06:11:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556025090; cv=none; d=google.com; s=arc-20160816; b=ob9QJnOv6rc79hRiasO+G82k6uTSzE6jb5+nasOC6ffaedYI+NanzZVQi1Fx/QS+FK yOswOCuvcgkSKLUylNh05+Y6lH3ZcAQJtqa7tiHwDgd6194QDz5ytoIjmsCoWl9fx9h2 w6vvxHEC0aVQryiLHLJDhvXRMfxRFYOtlJzCQVMwnHjUmqezuKza/5LFWqNm+BsVm8V4 g6ugYGUzAusK+qdGRdHoCPtMibaryP416UWGLToXxRicQ/EoUvvuIt4QDsJVwbfKEes1 ghaE6gA+y055g6JpXtWegWIE5CaXuJid0lo8rtri4UAKh1qG+tVZmImXOHNuvjSiikPy QOxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=u1SHPJmYCJP27BMPAbTUHo3jU/kt4nI6ZfcbGHQ5VsE=; b=bjSvgQ25y/VrpJeoVIEBGXbaEbZep7RGWFwGNvyMKoitqsZ1BhypXDfPfWTi6U1V5O xD0FXqgShn3FHc8yE8MXcVdsk5YEcbDR5lVZ08M6TlBXWvuh68Ie25/M2RoMrmPZOGEW H2WLk5AOagN3mB1t2VVyUdO9HncGXu/YyVob2nXJUVc5kxrusC2czg4ZFabMyQ8l0Fdv qoD+/SGJfymMrgv48tZ3ngh1P8nhQwVHSC7EA7kK2QKwL00HHr/smHHn586SIDhuZZlP TLGab/R99YRXfeA+H80UQ+K+kICOq7vN0hBXg5ikskX5sxybYxdYwXbRtHRPB+e1jVxw m/cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="n/xD416J"; 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=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z8si1943981pgr.548.2019.04.23.06.11.29; Tue, 23 Apr 2019 06:11:30 -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=@ti.com header.s=ti-com-17Q1 header.b="n/xD416J"; 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=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728189AbfDWNL2 (ORCPT + 30 others); Tue, 23 Apr 2019 09:11:28 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:58108 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727873AbfDWNJb (ORCPT ); Tue, 23 Apr 2019 09:09:31 -0400 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x3ND9RTl066412; Tue, 23 Apr 2019 08:09:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1556024968; bh=u1SHPJmYCJP27BMPAbTUHo3jU/kt4nI6ZfcbGHQ5VsE=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=n/xD416JStV8dw6SP40pX1x5Cag25LxEZydJqc0NzVDMoNJFg9iqzLI2wGXKgBB7Y p4cbgpbuBR6irHI0DltzEatyPJKHI5AzucUFZ74DKizaZXRdy2hcrbbBf47ZVzSVwq Mevn+0irVO/rGI6RjOrZzuP8f08+QezvRTnQ39Cc= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x3ND9Ri8045623 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 23 Apr 2019 08:09:27 -0500 Received: from DFLE115.ent.ti.com (10.64.6.36) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Tue, 23 Apr 2019 08:09:27 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Tue, 23 Apr 2019 08:09:27 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id x3ND9QmV107307; Tue, 23 Apr 2019 08:09:27 -0500 From: Grygorii Strashko To: , Ilias Apalodimas , "David S . Miller" , Ivan Khoronzhuk CC: Florian Fainelli , Andrew Lunn , Sekhar Nori , , , Murali Karicheri , Grygorii Strashko Subject: [PATCH net-next 08/19] net: ethernet: ti: cpsw: drop cpsw_tx_packet_submit() Date: Tue, 23 Apr 2019 16:08:59 +0300 Message-ID: <1556024950-20752-9-git-send-email-grygorii.strashko@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556024950-20752-1-git-send-email-grygorii.strashko@ti.com> References: <1556024950-20752-1-git-send-email-grygorii.strashko@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Drop unnecessary wrapper function cpsw_tx_packet_submit() which is used only in one place. Signed-off-by: Grygorii Strashko --- drivers/net/ethernet/ti/cpsw.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) -- 2.17.1 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index e714b8f4739c..fe3d145846d2 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1500,17 +1500,6 @@ static void cpsw_get_ethtool_stats(struct net_device *ndev, } } -static inline int cpsw_tx_packet_submit(struct cpsw_priv *priv, - struct sk_buff *skb, - struct cpdma_chan *txch) -{ - struct cpsw_common *cpsw = priv->cpsw; - - skb_tx_timestamp(skb); - return cpdma_chan_submit(txch, skb, skb->data, skb->len, - priv->emac_port + cpsw->data.dual_emac); -} - static inline void cpsw_add_dual_emac_def_ale_entries( struct cpsw_priv *priv, struct cpsw_slave *slave, u32 slave_port) @@ -2138,7 +2127,9 @@ static netdev_tx_t cpsw_ndo_start_xmit(struct sk_buff *skb, txch = cpsw->txv[q_idx].ch; txq = netdev_get_tx_queue(ndev, q_idx); - ret = cpsw_tx_packet_submit(priv, skb, txch); + skb_tx_timestamp(skb); + ret = cpdma_chan_submit(txch, skb, skb->data, skb->len, + priv->emac_port + cpsw->data.dual_emac); if (unlikely(ret != 0)) { cpsw_err(priv, tx_err, "desc submit failed\n"); goto fail;