From patchwork Sat May 15 22:13:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 439463 Delivered-To: patch@linaro.org Received: by 2002:a02:b78d:0:0:0:0:0 with SMTP id f13csp1438451jam; Sat, 15 May 2021 15:17:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyS6StipEURWkFbI1lf39MHfghd4t7RK4exv4DkbDs4SUChBU5L/M287TwAHGUW1DCGl7eJ X-Received: by 2002:a05:6e02:d50:: with SMTP id h16mr46740608ilj.127.1621117047522; Sat, 15 May 2021 15:17:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621117047; cv=none; d=google.com; s=arc-20160816; b=ZvQenVXAljU5shqRKesVYP4q1pcQwOZyL2lnZ5aI070CyqrDlM3n35nh6eF1rkaPDZ NzfO19c4DwzfatgTexLan5whAh9wPOrYWsbzoBP4LmYwH8zLrr5o4PHvKdkQ+x000j/d H64WeGkKoFYxkiQWCs9XC2kLtWcIwaSoZLO/pA0euvRU6lQJCIY8idbzvQCIJmz6jB1l Z1kCUi9rJuTeoBv2Aso4me4IPGXQpXSxy4xGRa3/3hmpfhgt6lM5m21TWdwZ4qxPjKWR NumOBs2pn+DKiCKntKJeNGmJJi0We3mWU8kpbHVqhH692C6yZz1OXbXb6jtLaTtFy2xg XR9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5b7uIBAD04b+xTAfgbcPygtffup7a4S+/3uDkeN/5OY=; b=JOonH6Ff1QiAF725rZnHBh1y0YeLsjmVLzmMyBG+jCNAjS+Afikx9P+nNsWpehO79Z ream1JJcCQQZtG8R+tqybew1HP0sqLgn9detMIb8ahWrtKuBzRcu/ylpo9aD3oLSHyc/ G1LDpAxfpBIlCyJ+TZ2SQ1IO9xIGlRareGwSojcBnwIro+P2C6QDg7AIBsjyd1P/1me4 UY8xuB2Z4bgKmGT+xB9LiNQzMbLfh08GXf4pPcXRWkWa0LHlcL4UKafG3EZuBgW8S8nf vmNyhRDmTgnJ+YGwlpZsHPT8Bz4+QSVCr1CoYh+KDBNmW2HzL/7rISq4e007Zo3+mP4+ gDAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KJk3QfQE; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o1si13082652jat.48.2021.05.15.15.17.27; Sat, 15 May 2021 15:17:27 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KJk3QfQE; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235378AbhEOWSi (ORCPT + 8 others); Sat, 15 May 2021 18:18:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:47970 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235386AbhEOWQa (ORCPT ); Sat, 15 May 2021 18:16:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3A460613BE; Sat, 15 May 2021 22:15:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621116916; bh=s7CSIpvZHbOWXeWkAI+whfYDuggnhcGoY3rP609LlF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KJk3QfQE7NcUQ6w6PZrDI4pgoJPfuoPKVEZMcVNlUuesR0XObHzObKw6Ugyx/xY5T wulTApabqCl0KlRoU0JkEUhX1oIckpa1CFKfMp/2jTfoElVVgYOh3TXH80ozUKWf7O qUfFMEMJQ5qZ3DjxATAaFu22UnOpfL4kd001RHfO1sHW15DxBPt9ZbeqTkU7DFgtfV IKE7fp1SgvOrL1aJLtjFTieJF5V5zyk35wp9bulSsi21GY+CMS6TD0WhkeWEUlIR+/ LDiG6ozsZakv5mhUo2rLOby2+HknV/OOj6d2ND0O6BFrGR3Z6I/xWu4tTg6uuUrDP/ i03KK4ealUYZw== From: Arnd Bergmann To: netdev@vger.kernel.org Cc: Arnd Bergmann , Paul Gortmaker , "Maciej W. Rozycki" , "David S. Miller" , Jakub Kicinski , Doug Berger , Florian Fainelli , Sam Creasey , Geert Uytterhoeven , Finn Thain , Christophe JAILLET , Andrew Lunn , Alexei Starovoitov , Eric Dumazet , Andrii Nakryiko , Bartosz Golaszewski , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com Subject: [RFC 13/13] [net-next] 8390: xsurf100: avoid including lib8390.c Date: Sun, 16 May 2021 00:13:20 +0200 Message-Id: <20210515221320.1255291-14-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210515221320.1255291-1-arnd@kernel.org> References: <20210515221320.1255291-1-arnd@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann This driver always warns about unused functions because it includes an file that it doesn't actually need: In file included from drivers/net/ethernet/8390/xsurf100.c:48: drivers/net/ethernet/8390/lib8390.c:995:27: error: '____alloc_ei_netdev' defined but not used [-Werror=unused-function] 995 | static struct net_device *____alloc_ei_netdev(int size) | ^~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/8390/lib8390.c:957:13: error: '__ei_set_multicast_list' defined but not used [-Werror=unused-function] 957 | static void __ei_set_multicast_list(struct net_device *dev) | ^~~~~~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/8390/lib8390.c:857:33: error: '__ei_get_stats' defined but not used [-Werror=unused-function] 857 | static struct net_device_stats *__ei_get_stats(struct net_device *dev) | ^~~~~~~~~~~~~~ drivers/net/ethernet/8390/lib8390.c:512:13: error: '__ei_poll' defined but not used [-Werror=unused-function] 512 | static void __ei_poll(struct net_device *dev) | ^~~~~~~~~ drivers/net/ethernet/8390/lib8390.c:303:20: error: '__ei_start_xmit' defined but not used [-Werror=unused-function] 303 | static netdev_tx_t __ei_start_xmit(struct sk_buff *skb, | ^~~~~~~~~~~~~~~ drivers/net/ethernet/8390/lib8390.c:257:13: error: '__ei_tx_timeout' defined but not used [-Werror=unused-function] 257 | static void __ei_tx_timeout(struct net_device *dev, unsigned int txqueue) | ^~~~~~~~~~~~~~~ drivers/net/ethernet/8390/lib8390.c:233:12: error: '__ei_close' defined but not used [-Werror=unused-function] 233 | static int __ei_close(struct net_device *dev) | ^~~~~~~~~~ drivers/net/ethernet/8390/lib8390.c:204:12: error: '__ei_open' defined but not used [-Werror=unused-function] 204 | static int __ei_open(struct net_device *dev) | ^~~~~~~~~ Use the normal library module instead and call the NS8390p_init() function. Fixes: 861928f4e60e ("net-next: New ax88796 platform driver for Amiga X-Surf 100 Zorro board (m68k)") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/8390/Makefile | 2 +- drivers/net/ethernet/8390/xsurf100.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) -- 2.29.2 diff --git a/drivers/net/ethernet/8390/Makefile b/drivers/net/ethernet/8390/Makefile index 85c83c566ec6..304897d5f0f9 100644 --- a/drivers/net/ethernet/8390/Makefile +++ b/drivers/net/ethernet/8390/Makefile @@ -16,5 +16,5 @@ obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o 8390.o obj-$(CONFIG_STNIC) += stnic.o 8390.o obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o obj-$(CONFIG_WD80x3) += wd.o 8390.o -obj-$(CONFIG_XSURF100) += xsurf100.o +obj-$(CONFIG_XSURF100) += xsurf100.o 8390.o obj-$(CONFIG_ZORRO8390) += zorro8390.o diff --git a/drivers/net/ethernet/8390/xsurf100.c b/drivers/net/ethernet/8390/xsurf100.c index e2c963821ffe..11d5d43e7202 100644 --- a/drivers/net/ethernet/8390/xsurf100.c +++ b/drivers/net/ethernet/8390/xsurf100.c @@ -42,10 +42,7 @@ /* Ensure we have our RCR base value */ #define AX88796_PLATFORM -static unsigned char version[] = - "ax88796.c: Copyright 2005,2007 Simtec Electronics\n"; - -#include "lib8390.c" +#include "8390.h" /* from ne.c */ #define NE_CMD EI_SHIFT(0x00) @@ -232,7 +229,7 @@ static void xs100_block_output(struct net_device *dev, int count, if (jiffies - dma_start > 2 * HZ / 100) { /* 20ms */ netdev_warn(dev, "timeout waiting for Tx RDC.\n"); ei_local->reset_8390(dev); - ax_NS8390_init(dev, 1); + NS8390p_init(dev, 1); break; } }