From patchwork Wed Mar 14 15:35:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 131604 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1021373ljb; Wed, 14 Mar 2018 08:38:07 -0700 (PDT) X-Google-Smtp-Source: AG47ELsxIvk+Bu+PizVMf/Y9+YkNFyKThxQIAafhc247BDxqjGtnghUfp6V+5urN3X546AHUNlqH X-Received: by 2002:a17:902:107:: with SMTP id 7-v6mr4475938plb.374.1521041887094; Wed, 14 Mar 2018 08:38:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521041887; cv=none; d=google.com; s=arc-20160816; b=Y/GWL2YuCiqX/fJGXO9ygH2VvuD3OlmENq3yrOwRXLy3c9rq/BUD+RSu5r7ImGcMIK dXUZt1HDWTD0MDxinpVlEqvi7WJ8hemvVcqLyQP2soDnqBkuGZIY2gPrA4Y1Kc35G9gz oKugKxZ3BXDtDrZbRifJBDk5kgXutSYDbL1QCQkIYpvR3K8Oo2mutBOKRUWVxKdLEWbv rynLFUbUAt6dgAmrxzpr9/fVBXSf6+JNaslOaf0eH10f5/CQpz62XH8h+B4d7Q8bpqtr oWkQtoEbhEtwcp44bNwmweSvN8+NqmJhNf6/fVGGJELXTWz7flKP+TFCh/5vF/4Y10WN 87Zw== 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:arc-authentication-results; bh=kquuWL82bR/MPIIFi+DuaJPFb3vIq8u98fJUDaT4t0o=; b=t1FtT77fYW936AnK0YwiCogQQETBqp+HuCiUCQOz8p+M+5/da1nl/XuCjA1uQxiBtR xsQ8SjAamdLzKUTG++tBod+7qWw08LPimAxNCnyBLGRJYi2q1wWhC+6ZsmWFYnMVLHm3 FITol+3Xjo2HvrN85nqRNDsNigVxkGbWeHQ9HvA3rmacL/PQ9eftV2gdONJQsdUnJyaF qbeuBGfJlt+Ircelz241WcQiX6PxFfqRL3L4S/SoXM48GaLdo/M1sz+Elv1bA/QWv8yO CMr+eQU8g+4F0QWjnnzI+D7NXmM+ZYg+uxeTvYau/VWCNBl0nYU4lLt+VZPS1dzetPwP GghA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v3si2019448pgq.608.2018.03.14.08.38.06; Wed, 14 Mar 2018 08:38:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752004AbeCNPiD (ORCPT + 28 others); Wed, 14 Mar 2018 11:38:03 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:55847 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751957AbeCNPiB (ORCPT ); Wed, 14 Mar 2018 11:38:01 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M9B5p-1em0Vm1a6n-00CT2M; Wed, 14 Mar 2018 16:37:35 +0100 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , "David S. Miller" , Randy Dunlap , David Howells , Finn Thain , netdev@vger.kernel.org Subject: [PATCH 04/47] net: 8390: remove m32r specific bits Date: Wed, 14 Mar 2018 16:35:17 +0100 Message-Id: <20180314153603.3127932-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180314153603.3127932-1-arnd@arndb.de> References: <20180314153603.3127932-1-arnd@arndb.de> X-Provags-ID: V03:K0:cpwVa9Y972fUrVjb87RJxgBs2ifw4ZQkPpC1qSGpIBCb2JSPaT3 5UxKUKZYS+NangidrG0dZH+OHcBdW6YhYAozar91HsXT1UQFllXho1H+iw6W+DKzn1YFiab wCnUdLbeM9bkvJQfsudzZ3HVmVuApc6dSK9hrehuC0QJCdvJhm0PpSqgYARdIOJM8qvku+b Hdkd/nuRnG1ZZ/JT9SHxA== X-UI-Out-Filterresults: notjunk:1; V01:K0:7fH30maxmlA=:RWOIj8ULHow4R7TUP6Vzll lR436CSyzil/scq1xUliWZv+u/dwFjIPGJzjXjh6XzkomnUyfNkuEaEQ7qhMppYA8VNGeqK5l khsRAnhE7cuawaeR9RBgw1/J20C+peEN+mJcEqSdTldZADWEQP0RzcwJK0kYfnWldQgEbekV/ 75MseZYKBKTUVxj3JJ27mMNveb8ymMtF7IMJVqO0+vGzl9mD9ohbREmDYdUF8dArMTgO37nkx 2LCr+Bqh+LuNw79O9SIRYZSuowWx4jkemV5tiy0KXVqdltTm2JNsJ5rJ5hUcXbnyq/GWDivPn z7E1Di6bSMxgg3b+K5mQ+1cCCb9BkKtBd9VPXN2jEq1cpGxvDKluEgZNmugYA/T4S3wIi0UY9 yBfevp9NMH9Lv7HmLeQdB6vtcv8N7BHgcn95D4uLsyZ8VWybWR9tFWZcPcM7KKHpBjUTv9WJN vUI0rWLFLZXB9PewNdRWu/LqAnSb+MDlGwz8aqjFMSmjBRBccuNAWwLrIfWd+rbxD5F714A4h WwTfbcrPXSFKeX7i4/rstWztxEzxlX156oVfFSTkXgM8gZ9OhMg4hFeV40tdty+zYBACmdhY5 dY1VaPCiA3kVCH8Cfm2r3pP0yaHmJyfqpzXm3mo/iLuOrf8CIGizfqt2Vv1YW9hfqhWcpf9Kv ZSzRzjcZDheIphi/AXi5R2ZgrKfXFcCDf3Ivc00XM2uCLyOE/CxymsHYeFH5q62FyATWo7E8U B8L8uiqp39z4hwrSlex+W/6e4u4KwgGrsdgkEg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The m32r architecture is getting removed, so we can kill off the architecture specific hacks in this driver. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/8390/Kconfig | 3 +-- drivers/net/ethernet/8390/ne.c | 23 ++--------------------- 2 files changed, 3 insertions(+), 23 deletions(-) -- 2.9.0 diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig index fdc673484add..9fee7c83ef9f 100644 --- a/drivers/net/ethernet/8390/Kconfig +++ b/drivers/net/ethernet/8390/Kconfig @@ -87,8 +87,7 @@ config MCF8390 config NE2000 tristate "NE2000/NE1000 support" - depends on (ISA || (Q40 && m) || M32R || MACH_TX49XX || \ - ATARI_ETHERNEC) + depends on (ISA || (Q40 && m) || MACH_TX49XX || ATARI_ETHERNEC) select CRC32 ---help--- If you have a network (Ethernet) card of this type, say Y here. diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c index 4cdff6e6af89..44a084b41bf0 100644 --- a/drivers/net/ethernet/8390/ne.c +++ b/drivers/net/ethernet/8390/ne.c @@ -99,7 +99,7 @@ MODULE_LICENSE("GPL"); that the ne2k probe is the last 8390 based probe to take place (as it is at boot) and so the probe will get confused by any other 8390 cards. ISA device autoprobes on a running machine are not recommended anyway. */ -#if !defined(MODULE) && (defined(CONFIG_ISA) || defined(CONFIG_M32R)) +#if !defined(MODULE) && defined(CONFIG_ISA) /* Do we need a portlist for the ISA auto-probe ? */ #define NEEDS_PORTLIST #endif @@ -164,12 +164,7 @@ bad_clone_list[] __initdata = { #define NESM_START_PG 0x40 /* First page of TX buffer */ #define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */ -#if defined(CONFIG_PLAT_MAPPI) -# define DCR_VAL 0x4b -#elif defined(CONFIG_PLAT_OAKS32R) || \ - defined(CONFIG_MACH_TX49XX) -# define DCR_VAL 0x48 /* 8-bit mode */ -#elif defined(CONFIG_ATARI) /* 8-bit mode on Atari, normal on Q40 */ +#if defined(CONFIG_ATARI) /* 8-bit mode on Atari, normal on Q40 */ # define DCR_VAL (MACH_IS_ATARI ? 0x48 : 0x49) #else # define DCR_VAL 0x49 @@ -422,12 +417,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) stop_page = NE1SM_STOP_PG; } -#if defined(CONFIG_PLAT_MAPPI) || defined(CONFIG_PLAT_OAKS32R) - neX000 = ((SA_prom[14] == 0x57 && SA_prom[15] == 0x57) - || (SA_prom[14] == 0x42 && SA_prom[15] == 0x42)); -#else neX000 = (SA_prom[14] == 0x57 && SA_prom[15] == 0x57); -#endif ctron = (SA_prom[0] == 0x00 && SA_prom[1] == 0x00 && SA_prom[2] == 0x1d); copam = (SA_prom[14] == 0x49 && SA_prom[15] == 0x00); @@ -508,18 +498,9 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) dev->base_addr = ioaddr; -#ifdef CONFIG_PLAT_MAPPI - outb_p(E8390_NODMA + E8390_PAGE1 + E8390_STOP, - ioaddr + E8390_CMD); /* 0x61 */ - for (i = 0; i < ETH_ALEN; i++) { - dev->dev_addr[i] = SA_prom[i] - = inb_p(ioaddr + EN1_PHYS_SHIFT(i)); - } -#else for (i = 0; i < ETH_ALEN; i++) { dev->dev_addr[i] = SA_prom[i]; } -#endif pr_cont("%pM\n", dev->dev_addr);