From patchwork Mon Oct 31 20:43:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 689625 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3t76011PXFz9vF7 for ; Tue, 1 Nov 2016 07:48:33 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b=rhVhb3p/; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1034068AbcJaUoG (ORCPT ); Mon, 31 Oct 2016 16:44:06 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:38311 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1034017AbcJaUoC (ORCPT ); Mon, 31 Oct 2016 16:44:02 -0400 Received: by mail-wm0-f50.google.com with SMTP id n67so251676749wme.1 for ; Mon, 31 Oct 2016 13:44:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BhNf7YYEffibnj+kaFYR4D42OgRrSB5biF8wG0AvRkM=; b=rhVhb3p/bXOgR8EafHH3dqHNb5EW+xxUc0DTI5gCRS/nf85KjPZWWN0LhigRhaUmtk UHNRwHOT7cFpqd1C4EZX9Sm//pnpUSnm3BGcfK9PK01Z2p3baHRQD1WLBUUriCMvBeKE i6eprz+zQWQJWWZbyMRHoP+YF8glzerXR9DyMpM0UeVgxjEljHm+gC9yIYLcq8KaV9xP D/7rs0DCSjXSlFeWgnIWf8U7UglDHIDjpuB1I+qG49arQcqNyEay5fYscLeJ+vZVxakc gEZ4UdnluKg02ZkmJgU3xQl4ZwSbThWsWQ/UdLYOyCQFv2Io6JexpdUy4K8gSfRV13jf EUxA== 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=BhNf7YYEffibnj+kaFYR4D42OgRrSB5biF8wG0AvRkM=; b=JIA/O5chIi5/bPAepmN2CxV51mQ3RcjAgXI2VcwhG/buxgsjD0qejMYnJeKuWRZkD8 aUoOIvzEVxIctzSciZOFgY1JZj0aW3fchIcZ46ZAwZpgbWOgfBkolidpvUSA7b4L6LVg 4cvxFzaYtN+PQIxrMMGvZX50LF4n/wzIZibwaMkInBSC99Qb1S1j3hOX+Op5+1OAlU0n 2NUApbY/IRUnXdMBYstcJW8c0UJTVlkZ03w7H5zPttkTt+l+pwBEqctWBCAaFAG3/Mm4 qAyqiDk7FTzZ5R4cIB/dKQLFabpdE4quwAyzb2UXBIERGqE/m+SAwn2ZzQzkrvfhf61x S23w== X-Gm-Message-State: ABUngveCZjaP+VO9IZKQyejdQraEgTXhKX50fgSHd3duPSc0sPVjkiKLPOtJ2jgoxxIMUkPP X-Received: by 10.28.145.85 with SMTP id t82mr13234079wmd.40.1477946641076; Mon, 31 Oct 2016 13:44:01 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com (host-79-78-33-110.static.as9105.net. [79.78.33.110]) by smtp.gmail.com with ESMTPSA id wn5sm31744405wjb.42.2016.10.31.13.44.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 31 Oct 2016 13:44:00 -0700 (PDT) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: Jakub Kicinski Subject: [PATCH net-next 04/14] nfp: remove inline attributes and dead code Date: Mon, 31 Oct 2016 20:43:12 +0000 Message-Id: <1477946602-19644-5-git-send-email-jakub.kicinski@netronome.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1477946602-19644-1-git-send-email-jakub.kicinski@netronome.com> References: <1477946602-19644-1-git-send-email-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Don't declare functions as static inline in .c files and remove dead code it was hiding. Signed-off-by: Jakub Kicinski --- 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)