From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: netdev@vger.kernel.org
Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
Subject: [PATCH net-next 04/14] nfp: remove inline attributes and dead code
Date: Mon, 31 Oct 2016 20:43:12 +0000 [thread overview]
Message-ID: <1477946602-19644-5-git-send-email-jakub.kicinski@netronome.com> (raw)
In-Reply-To: <1477946602-19644-1-git-send-email-jakub.kicinski@netronome.com>
Don't declare functions as static inline in .c files and
remove dead code it was hiding.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index bd28e42bee2b..025483fb9103 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -576,7 +576,7 @@ static void nfp_net_aux_irq_free(struct nfp_net *nn, u32 ctrl_offset,
*
* Return: True if the ring is full.
*/
-static inline int nfp_net_tx_full(struct nfp_net_tx_ring *tx_ring, int dcnt)
+static int nfp_net_tx_full(struct nfp_net_tx_ring *tx_ring, int dcnt)
{
return (tx_ring->wr_p - tx_ring->rd_p) >= (tx_ring->cnt - dcnt);
}
@@ -1032,19 +1032,6 @@ static void nfp_net_tx_timeout(struct net_device *netdev)
*/
/**
- * nfp_net_rx_space() - return the number of free slots on the RX ring
- * @rx_ring: RX ring structure
- *
- * Make sure we leave at least one slot free.
- *
- * Return: True if there is space on the RX ring
- */
-static inline int nfp_net_rx_space(struct nfp_net_rx_ring *rx_ring)
-{
- return (rx_ring->cnt - 1) - (rx_ring->wr_p - rx_ring->rd_p);
-}
-
-/**
* nfp_net_rx_alloc_one() - Allocate and map skb for RX
* @rx_ring: RX ring structure of the skb
* @dma_addr: Pointer to storage for DMA address (output param)
--
1.9.1
next prev parent reply other threads:[~2016-10-31 20:44 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-31 20:43 [PATCH net-next 00/14] cleanups and RX path rewrite Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 01/14] nfp: simplify nfp_net_poll() Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 02/14] nfp: remove support for nfp3200 Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 03/14] nfp: remove unnecessary call to ether_setup() Jakub Kicinski
2016-10-31 20:43 ` Jakub Kicinski [this message]
2016-10-31 20:43 ` [PATCH net-next 05/14] nfp: centralize the buffer size calculation Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 06/14] nfp: add buffer drop/recycle helper for RX Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 07/14] nfp: use alloc_frag() and build_skb() Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 08/14] nfp: add separate buffer allocation function for napi Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 09/14] nfp: use AND instead of modulo to get ring indexes Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 10/14] nfp: create separate define for max number of vectors Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 11/14] nfp: use unsigned int for vector/ring counts Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 12/14] nfp: remove nfp_net_irqs_wanted() Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 13/14] nfp: replace num_irqs with max_r_vecs Jakub Kicinski
2016-10-31 20:43 ` [PATCH net-next 14/14] nfp: bring back support for different ring counts Jakub Kicinski
2016-11-01 15:05 ` [PATCH net-next 00/14] cleanups and RX path rewrite David Miller
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=1477946602-19644-5-git-send-email-jakub.kicinski@netronome.com \
--to=jakub.kicinski@netronome.com \
--cc=netdev@vger.kernel.org \
/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).