From patchwork Mon Apr 25 21:26:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 12826306 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15094C35280 for ; Mon, 25 Apr 2022 22:21:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236571AbiDYWYw (ORCPT ); Mon, 25 Apr 2022 18:24:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343611AbiDYVpe (ORCPT ); Mon, 25 Apr 2022 17:45:34 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8CFD10C88A; Mon, 25 Apr 2022 14:42:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7163B61480; Mon, 25 Apr 2022 21:42:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7C289C385A7; Mon, 25 Apr 2022 21:42:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650922947; bh=nreQfjm+N9qOhwr5Z/uFXcKNU+5eXomO6oZib8laKZg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qyGvmkis4NtIMuPisOOwB6nGpLl1CrkC66uKzbOFYEVssd/6RtOk2FkzUifqRL1zi q9+7YfAa38802srg9wLvBixFw9fJUiEIURuTN0UP+VF4zMlkJFGuw9MohFkvxX7xim vugpiJywGHPp+gh1s/DK/u/uA9eNbzlPB779kBBELWlq9mRHE/51g+8rTE6u8fhOcg 7GJZzsfA9k5GZ+//TVujEzlWJsBLvYQwonWDFOs2bTAW9tfDL6/V3NN+rtyNk7oaaM wRxXhSLD6vMQYU8OheTOKOBVj9BCADbg/5AjXUyNICyP/MQ1uDclN0AlEIl8kgoe9k WR0O9pA75GGAg== From: Bjorn Helgaas To: Jakub Kicinski , "David S . Miller" , Paolo Abeni , Chas Williams <3chas3@gmail.com> Cc: linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 1/2] net: wan: atp: remove unused eeprom_delay() Date: Mon, 25 Apr 2022 16:26:43 -0500 Message-Id: <20220425212644.1659070-2-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425212644.1659070-1-helgaas@kernel.org> References: <20220425212644.1659070-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Bjorn Helgaas atp.h is included only by atp.c, which does not use eeprom_delay(). Remove the unused definition. Signed-off-by: Bjorn Helgaas --- drivers/net/ethernet/realtek/atp.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/realtek/atp.h b/drivers/net/ethernet/realtek/atp.h index 63f0d2d0e87b..b202184eddd4 100644 --- a/drivers/net/ethernet/realtek/atp.h +++ b/drivers/net/ethernet/realtek/atp.h @@ -255,10 +255,6 @@ static inline void write_word_mode0(short ioaddr, unsigned short value) #define EE_DATA_WRITE 0x01 /* EEPROM chip data in. */ #define EE_DATA_READ 0x08 /* EEPROM chip data out. */ -/* Delay between EEPROM clock transitions. */ -#define eeprom_delay(ticks) \ -do { int _i = 40; while (--_i > 0) { __SLOW_DOWN_IO; } } while (0) - /* The EEPROM commands include the alway-set leading bit. */ #define EE_WRITE_CMD(offset) (((5 << 6) + (offset)) << 17) #define EE_READ(offset) (((6 << 6) + (offset)) << 17) From patchwork Mon Apr 25 21:26:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 12826302 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFCE0C433FE for ; Mon, 25 Apr 2022 22:21:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232629AbiDYWYg (ORCPT ); Mon, 25 Apr 2022 18:24:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343612AbiDYVph (ORCPT ); Mon, 25 Apr 2022 17:45:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B2FC10C88A; Mon, 25 Apr 2022 14:42:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1614A61480; Mon, 25 Apr 2022 21:42:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 440C0C385A7; Mon, 25 Apr 2022 21:42:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650922951; bh=VWIdJNxWRCfgar7Ib519tgDolGkr3hghcxrk47Iv2bY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JCSlFBhzffcdhcGYF80E592JT4Vy3+6VdVEPq/PczkwHKG8P7RqVakcZPxqd4lHXG qZNPEwrFzs6Tme1DPl68z/svMz1LwtGg+snbuw3WLDDcpzPCO5AVNItJxnhrjeOKU7 HnDysQkUW12U+Av8FM2pFn5UN2+uWsllmoqtalc8OmwmEjtqJAYnrs7ndKltQmd1hC 0FJHcjKYcNmbxdl4YgTrgVliBx521EifMChH74OWoU5Eeqi3Ua8TjYMDnbCtx3UnyL 5qyn7+oekX737GRyF6B7hvIg2JM3AnpJnmQNwYZUKQA+Scdjcn+jhoUyXhhgi+rMDH 1VfQcIyAYWRog== From: Bjorn Helgaas To: Jakub Kicinski , "David S . Miller" , Paolo Abeni , Chas Williams <3chas3@gmail.com> Cc: linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: [PATCH 2/2] net: remove comments that mention obsolete __SLOW_DOWN_IO Date: Mon, 25 Apr 2022 16:26:44 -0500 Message-Id: <20220425212644.1659070-3-helgaas@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220425212644.1659070-1-helgaas@kernel.org> References: <20220425212644.1659070-1-helgaas@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Bjorn Helgaas The only remaining definitions of __SLOW_DOWN_IO (for alpha and ia64) do nothing, and the only mentions in networking are in comments. Remove these mentions. Signed-off-by: Bjorn Helgaas --- drivers/atm/nicstarmac.c | 5 ----- drivers/net/ethernet/dec/tulip/winbond-840.c | 2 -- drivers/net/ethernet/natsemi/natsemi.c | 2 -- 3 files changed, 9 deletions(-) diff --git a/drivers/atm/nicstarmac.c b/drivers/atm/nicstarmac.c index e0dda9062e6b..791f69a07ddf 100644 --- a/drivers/atm/nicstarmac.c +++ b/drivers/atm/nicstarmac.c @@ -14,11 +14,6 @@ typedef void __iomem *virt_addr_t; #define CYCLE_DELAY 5 -/* - This was the original definition -#define osp_MicroDelay(microsec) \ - do { int _i = 4*microsec; while (--_i > 0) { __SLOW_DOWN_IO; }} while (0) -*/ #define osp_MicroDelay(microsec) {unsigned long useconds = (microsec); \ udelay((useconds));} /* diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c index 86b1d23eba83..1db19463fd46 100644 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c @@ -474,8 +474,6 @@ static int w840_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) No extra delay is needed with 33Mhz PCI, but future 66Mhz access may need a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that made udelay() unreliable. - The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is - deprecated. */ #define eeprom_delay(ee_addr) ioread32(ee_addr) diff --git a/drivers/net/ethernet/natsemi/natsemi.c b/drivers/net/ethernet/natsemi/natsemi.c index 82a22711ce45..50bca486a244 100644 --- a/drivers/net/ethernet/natsemi/natsemi.c +++ b/drivers/net/ethernet/natsemi/natsemi.c @@ -989,8 +989,6 @@ static int natsemi_probe1(struct pci_dev *pdev, const struct pci_device_id *ent) No extra delay is needed with 33Mhz PCI, but future 66Mhz access may need a delay. Note that pre-2.0.34 kernels had a cache-alignment bug that made udelay() unreliable. - The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is - deprecated. */ #define eeprom_delay(ee_addr) readl(ee_addr)