From: dwesterg@gmail.com
To: netdev@vger.kernel.org, dinguyen@kernel.org,
thor.thayer@linux.intel.com, richardcochran@gmail.com,
davem@davemloft.net, vbridger@opensource.altera.com,
robh+dt@kernel.org, mark.rutland@arm.commark.rutland@arm.com,
devicetree@vger.kernel.org, hean.loong.ong@intel.com
Cc: Dalon Westergreen <dalon.westergreen@linux.intel.com>
Subject: [PATCH v2 net-next 07/10] net: eth: altera: change tx functions to type netdev_tx_t
Date: Thu, 13 Dec 2018 09:52:49 -0800 [thread overview]
Message-ID: <20181213175252.21143-8-dalon.westergreen@linux.intel.com> (raw)
In-Reply-To: <20181213175252.21143-1-dalon.westergreen@linux.intel.com>
From: Dalon Westergreen <dalon.westergreen@linux.intel.com>
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 <dalon.westergreen@linux.intel.com>
---
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 0fb986ba3290..95f016731cc2 100644
--- a/drivers/net/ethernet/altera/altera_msgdma.c
+++ b/drivers/net/ethernet/altera/altera_msgdma.c
@@ -117,7 +117,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));
@@ -131,7 +132,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 e18be91a48a7..e9008e3761b9 100644
--- a/drivers/net/ethernet/altera/altera_msgdma.h
+++ b/drivers/net/ethernet/altera/altera_msgdma.h
@@ -27,8 +27,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 eb47b9b820bb..93f66af338de 100644
--- a/drivers/net/ethernet/altera/altera_sgdma.c
+++ b/drivers/net/ethernet/altera/altera_sgdma.c
@@ -177,7 +177,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;
@@ -204,7 +205,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 769e720a2043..984c00d81596 100644
--- a/drivers/net/ethernet/altera/altera_sgdma.h
+++ b/drivers/net/ethernet/altera/altera_sgdma.h
@@ -24,8 +24,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 f435fb0eca90..6e7f92ebf3cf 100644
--- a/drivers/net/ethernet/altera/altera_tse.h
+++ b/drivers/net/ethernet/altera/altera_tse.h
@@ -403,8 +403,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 b25d03506470..24915f72e965 100644
--- a/drivers/net/ethernet/altera/altera_tse_main.c
+++ b/drivers/net/ethernet/altera/altera_tse_main.c
@@ -564,7 +564,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.19.2
next prev parent reply other threads:[~2018-12-13 17:52 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 17:52 [PATCH v2 net-next 00/10] net: eth: altera: tse: Add PTP and mSGDMA prefetcher dwesterg
2018-12-13 17:52 ` [PATCH v2 net-next 01/10] net: eth: altera: tse_start_xmit ignores tx_buffer call response dwesterg
2018-12-18 15:32 ` Thor Thayer
2018-12-13 17:52 ` [PATCH v2 net-next 02/10] net: eth: altera: set rx and tx ring size before init_dma call dwesterg
2018-12-18 15:33 ` Thor Thayer
2018-12-13 17:52 ` [PATCH v2 net-next 03/10] net: eth: altera: fix altera_dmaops declaration dwesterg
2018-12-18 15:33 ` Thor Thayer
2018-12-13 17:52 ` [PATCH v2 net-next 04/10] net: eth: altera: add optional function to start tx dma dwesterg
2018-12-18 15:34 ` Thor Thayer
2018-12-13 17:52 ` [PATCH v2 net-next 05/10] net: eth: altera: Move common functions to altera_utils dwesterg
2018-12-18 15:37 ` Thor Thayer
2018-12-13 17:52 ` [PATCH v2 net-next 06/10] net: eth: altera: Add missing identifier names to function declarations dwesterg
2018-12-18 15:45 ` Thor Thayer
2018-12-18 15:52 ` Dalon L Westergreen
2018-12-13 17:52 ` dwesterg [this message]
2018-12-18 15:48 ` [PATCH v2 net-next 07/10] net: eth: altera: change tx functions to type netdev_tx_t Thor Thayer
2018-12-13 17:52 ` [PATCH v2 net-next 08/10] net: eth: altera: add support for ptp and timestamping dwesterg
2018-12-19 4:27 ` Richard Cochran
2018-12-19 19:27 ` Westergreen, Dalon
2018-12-13 17:52 ` [PATCH v2 net-next 09/10] net: eth: altera: add msgdma prefetcher dwesterg
2018-12-18 16:33 ` Thor Thayer
2018-12-18 17:00 ` Dalon L Westergreen
2018-12-13 17:52 ` [PATCH v2 net-next 10/10] net: eth: altera: update devicetree bindings documentation dwesterg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181213175252.21143-8-dalon.westergreen@linux.intel.com \
--to=dwesterg@gmail.com \
--cc=dalon.westergreen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=dinguyen@kernel.org \
--cc=mark.rutland@arm.commark.rutland \
--cc=netdev@vger.kernel.org \
--cc=richardcochran@gmail.com \
--cc=robh+dt@kernel.org \
--cc=thor.thayer@linux.intel.com \
--cc=vbridger@opensource.altera.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).