Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp3372562ybz; Mon, 4 May 2020 01:33:06 -0700 (PDT) X-Google-Smtp-Source: APiQypJ40fpo5YUeXZfpS1OcO9k4rgzYL3oZ5JLLjGE/iCJ8vpqbhxZAEbebQZqzlyxKFv7KqwKm X-Received: by 2002:aa7:c0d2:: with SMTP id j18mr13757048edp.283.1588581186187; Mon, 04 May 2020 01:33:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588581186; cv=none; d=google.com; s=arc-20160816; b=pX4xTwL8RUllhtu4k9OUoSDq18B4aupit5RJ3GBvbWG4Uyo3rMGmc0Avzr033ZJjZA oKQis4RN1X5GdHVBL1wzoVWCC7hue2v3cOn4w1i2ghpXI/6rqrVkbhNUnugKk0wMMeQd 0fHwyOg2YFEVro168p9/9vnB4TNHn/N1NIjGVVVXTXhzddEvUWkwMi84I1SGVAzKss6P BCdvMBNdRAQAHoh+MhHrjaMOWR6ORoksptI8DWU5joEno+pVuQ//VXdl+9OXBmr3YE3b giaYTAd8vs+tyNANF1l6M2yRNVUGi2us0qzQRbbnJEG0N3gSzXrwk7eMMS95Dn6vq/Fy uFmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr; bh=ldmGs8rUEpwY9AhKQu1OAkCgT+f2V6Zq6iTUgNM/RXg=; b=gvV14L110zW5ZeFnNCXrwL8eXtlUZiL5XSOjSXZSxGPO9oxSwVxksB3SFjniMa+92A APRyWhA75WDkS90jCnGqcZJZe7Kc4zQfH1Qjcp2dvesa6m9kTg7+tVJbVySr3d1rEyS1 +GpksAb/riT63qzdsvls3fvEpvCNcKCDfT1SdNUJEHsQIz3ZJFrzD0qSiTTxwU0PJ03A ulS7bQp8OMl1hLd8j2DI/zDCrTuGuO/Tx7zUskOr+y9g2flTzovk3BC15dOhYbG7jsJQ eKIaIdl48eXRuwb8y1JHrtxj6dU+7HuAtj7GHtLCenQF3vRmJMpm+WWDQq35gBDzeY8y 09/g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v6si4732998edd.195.2020.05.04.01.32.43; Mon, 04 May 2020 01:33:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728315AbgEDI2h (ORCPT + 99 others); Mon, 4 May 2020 04:28:37 -0400 Received: from mga06.intel.com ([134.134.136.31]:45997 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725941AbgEDI2f (ORCPT ); Mon, 4 May 2020 04:28:35 -0400 IronPort-SDR: gF8UAOSIACLXt0H2glWFYEGI/NFZSBnJztFum2Hk/A7Gf+IQQ4VTb64BI24q4a/bYNqs6UsxQE CSuvyeIl5QwA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2020 01:28:34 -0700 IronPort-SDR: NXkswAQMcxYrIFnk3NCPOOYFknpFORBx5VR/f8nnbEA+jAeDkvYpXt0HBLe1N/Uq4edSDh27YK urggb7beQaNg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,351,1583222400"; d="scan'208";a="295436117" Received: from pg-nxl3.altera.com ([10.142.129.93]) by orsmga008.jf.intel.com with ESMTP; 04 May 2020 01:28:32 -0700 From: Joyce Ooi To: Thor Thayer , "David S . Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Dalon Westergreen , Joyce Ooi , Tan Ley Foon , See Chin Liang , Dinh Nguyen , Dalon Westergreen Subject: [PATCHv2 07/10] net: eth: altera: change tx functions to type netdev_tx_t Date: Mon, 4 May 2020 16:25:55 +0800 Message-Id: <20200504082558.112627-8-joyce.ooi@intel.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20200504082558.112627-1-joyce.ooi@intel.com> References: <20200504082558.112627-1-joyce.ooi@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dalon Westergreen Modify all msgdma and sgdma tx_buffer functions to be of type netdev_tx_t, and also modify main tx function to be of netdev_tx_t type. Signed-off-by: Dalon Westergreen Signed-off-by: Joyce Ooi --- v2: this patch is added in patch set version 2 --- drivers/net/ethernet/altera/altera_msgdma.c | 5 +++-- drivers/net/ethernet/altera/altera_msgdma.h | 4 ++-- drivers/net/ethernet/altera/altera_sgdma.c | 5 +++-- drivers/net/ethernet/altera/altera_sgdma.h | 4 ++-- drivers/net/ethernet/altera/altera_tse.h | 4 ++-- drivers/net/ethernet/altera/altera_tse_main.c | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/altera/altera_msgdma.c b/drivers/net/ethernet/altera/altera_msgdma.c index ac1efd08267a..ac68151a7f47 100644 --- a/drivers/net/ethernet/altera/altera_msgdma.c +++ b/drivers/net/ethernet/altera/altera_msgdma.c @@ -106,7 +106,8 @@ void msgdma_clear_txirq(struct altera_tse_private *priv) } /* return 0 to indicate transmit is pending */ -int msgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer) +netdev_tx_t +msgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer) { csrwr32(lower_32_bits(buffer->dma_addr), priv->tx_dma_desc, msgdma_descroffs(read_addr_lo)); @@ -120,7 +121,7 @@ int msgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer) msgdma_descroffs(stride)); csrwr32(MSGDMA_DESC_CTL_TX_SINGLE, priv->tx_dma_desc, msgdma_descroffs(control)); - return 0; + return NETDEV_TX_OK; } u32 msgdma_tx_completions(struct altera_tse_private *priv) diff --git a/drivers/net/ethernet/altera/altera_msgdma.h b/drivers/net/ethernet/altera/altera_msgdma.h index 23f5b2a13898..d816b24dfa7f 100644 --- a/drivers/net/ethernet/altera/altera_msgdma.h +++ b/drivers/net/ethernet/altera/altera_msgdma.h @@ -16,8 +16,8 @@ void msgdma_clear_txirq(struct altera_tse_private *priv); u32 msgdma_tx_completions(struct altera_tse_private *priv); void msgdma_add_rx_desc(struct altera_tse_private *priv, struct tse_buffer *buffer); -int msgdma_tx_buffer(struct altera_tse_private *priv, - struct tse_buffer *buffer); +netdev_tx_t msgdma_tx_buffer(struct altera_tse_private *priv, + struct tse_buffer *buffer); u32 msgdma_rx_status(struct altera_tse_private *priv); int msgdma_initialize(struct altera_tse_private *priv); void msgdma_uninitialize(struct altera_tse_private *priv); diff --git a/drivers/net/ethernet/altera/altera_sgdma.c b/drivers/net/ethernet/altera/altera_sgdma.c index 77e2c5e3650f..24157cade52d 100644 --- a/drivers/net/ethernet/altera/altera_sgdma.c +++ b/drivers/net/ethernet/altera/altera_sgdma.c @@ -166,7 +166,8 @@ void sgdma_clear_txirq(struct altera_tse_private *priv) * will now actually look at the code, so from now, 0 is good and return * NETDEV_TX_BUSY when busy. */ -int sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer) +netdev_tx_t +sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer) { struct sgdma_descrip __iomem *descbase = (struct sgdma_descrip __iomem *)priv->tx_dma_desc; @@ -193,7 +194,7 @@ int sgdma_tx_buffer(struct altera_tse_private *priv, struct tse_buffer *buffer) /* enqueue the request to the pending transmit queue */ queue_tx(priv, buffer); - return 0; + return NETDEV_TX_OK; } diff --git a/drivers/net/ethernet/altera/altera_sgdma.h b/drivers/net/ethernet/altera/altera_sgdma.h index 3fb201417820..6a41833f0965 100644 --- a/drivers/net/ethernet/altera/altera_sgdma.h +++ b/drivers/net/ethernet/altera/altera_sgdma.h @@ -13,8 +13,8 @@ void sgdma_disable_rxirq(struct altera_tse_private *priv); void sgdma_disable_txirq(struct altera_tse_private *priv); void sgdma_clear_rxirq(struct altera_tse_private *priv); void sgdma_clear_txirq(struct altera_tse_private *priv); -int sgdma_tx_buffer(struct altera_tse_private *priv, - struct tse_buffer *buffer); +netdev_tx_t sgdma_tx_buffer(struct altera_tse_private *priv, + struct tse_buffer *buffer); u32 sgdma_tx_completions(struct altera_tse_private *priv); void sgdma_add_rx_desc(struct altera_tse_private *priv, struct tse_buffer *buffer); diff --git a/drivers/net/ethernet/altera/altera_tse.h b/drivers/net/ethernet/altera/altera_tse.h index fa24ab3c7d6a..79d02748c89d 100644 --- a/drivers/net/ethernet/altera/altera_tse.h +++ b/drivers/net/ethernet/altera/altera_tse.h @@ -392,8 +392,8 @@ struct altera_dmaops { void (*disable_rxirq)(struct altera_tse_private *priv); void (*clear_txirq)(struct altera_tse_private *priv); void (*clear_rxirq)(struct altera_tse_private *priv); - int (*tx_buffer)(struct altera_tse_private *priv, - struct tse_buffer *buffer); + netdev_tx_t (*tx_buffer)(struct altera_tse_private *priv, + struct tse_buffer *buffer); u32 (*tx_completions)(struct altera_tse_private *priv); void (*add_rx_desc)(struct altera_tse_private *priv, struct tse_buffer *buffer); diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c index 87f789e42b6e..24a1d30c6780 100644 --- a/drivers/net/ethernet/altera/altera_tse_main.c +++ b/drivers/net/ethernet/altera/altera_tse_main.c @@ -553,7 +553,7 @@ static irqreturn_t altera_isr(int irq, void *dev_id) * physically contiguous fragment starting at * skb->data, for length of skb_headlen(skb). */ -static int tse_start_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t tse_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct altera_tse_private *priv = netdev_priv(dev); unsigned int txsize = priv->tx_ring_size; -- 2.13.0