Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp3130365ioa; Mon, 25 Apr 2022 18:47:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZy/tFnxuORpDTmi6VEFi5GQgFfO8c5ujEmrEpllzSlR/rthcJwK0FsRKjp9OjpJjG7Zrf X-Received: by 2002:a17:902:d2c5:b0:158:f839:4d8a with SMTP id n5-20020a170902d2c500b00158f8394d8amr20874702plc.108.1650937664786; Mon, 25 Apr 2022 18:47:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650937664; cv=none; d=google.com; s=arc-20160816; b=lLX5EUFsoMuUUStBKBOSHyVKbb6uUeUB/uDdYoDeuQrwYhiFbCsBvZIKDoic1/rbd7 3Eq+6Qdv/B2zkKcsJFAf9elj2f3EGXlq/Rikp1EqeYf2YMlYHUluDGWFO8Lmw+nkMQ+r 4ZV7RcTRxzk/n/sa5dUNYPJsslcto3nqxJNosf4IcntJSdBNZ6TSqTSzZJ1buJw1RXfM piD/MeYk8PVfNkLNlLjUmt1Btap0E7Pjgj65qMDHrivnB0H9/PigcaAVTS9kYqLARs1e J9mGzGrY1Ahm/YRKSp5cURLqCoyufMb3i/XgfT3vgDOtGj6y2x+5UvhscWQ4sO8TCfKw 7H1Q== 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=3RQ8ktY0PS9YekSZKaTWh7YOAYj9Ep9Sbp2AQ8t04/s=; b=Re9jzLLzzCiaQr+6fAx5sl4zALW9WHJPVnOqseM5ySdR8lHqsgm1Q2B+jgoEPnLV4l Y+MgklU4YtdjsTCzsJvdPOXV342WGnwQJWlJpK3zaBwhHJjuohgRr9XF3MyYxFlotRkm jyrWa1iKDvCAOwn+EtEq4OS2E3lgAQX7c2EifWlputnAyxYh12Vb243Zp4ZAsGlPKR8i RyG0e1H58a7X37SmIJq338tt87NtHPZk5yNv8GdtudAY83GpwdxR981KpklPFzSK0Xf8 hCJ29ICFNTSIKVfI0fKcDi1PPNRRJ1Sec8mvGHyB8eFkuvu/SlCtxUCJq64hvlMoL2UT Gm+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JCSlFBhz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i9-20020a632209000000b003aaed272141si7823349pgi.57.2022.04.25.18.47.28; Mon, 25 Apr 2022 18:47:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JCSlFBhz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S232805AbiDYW0u (ORCPT + 99 others); Mon, 25 Apr 2022 18:26:50 -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 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.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) -- 2.25.1