From: Bjorn Helgaas <helgaas@kernel.org>
To: Richard Henderson <rth@twiddle.net>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Matt Turner <mattst88@gmail.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Rich Felker <dalias@libc.org>, Chas Williams <3chas3@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org,
netdev@vger.kernel.org, linux-atm-general@lists.sourceforge.net,
linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org,
Bjorn Helgaas <bhelgaas@google.com>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 2/7] net: wan: lmc: remove unused DELAY()
Date: Fri, 15 Apr 2022 14:08:12 -0500 [thread overview]
Message-ID: <20220415190817.842864-3-helgaas@kernel.org> (raw)
In-Reply-To: <20220415190817.842864-1-helgaas@kernel.org>
From: Bjorn Helgaas <bhelgaas@google.com>
lmc_var.h is included only by files in drivers/net/wan/lmc/, and none of
them uses DELAY(). Remove the unused definition and related comments.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/net/wan/lmc/lmc_main.c | 8 --------
drivers/net/wan/lmc/lmc_var.h | 8 --------
2 files changed, 16 deletions(-)
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 76c6b4f89890..45b2d25782ed 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -1669,21 +1669,17 @@ unsigned lmc_mii_readreg (lmc_softc_t * const sc, unsigned devaddr, unsigned reg
LMC_CSR_WRITE (sc, csr_9, dataval);
lmc_delay ();
- /* __SLOW_DOWN_IO; */
LMC_CSR_WRITE (sc, csr_9, dataval | 0x10000);
lmc_delay ();
- /* __SLOW_DOWN_IO; */
}
for (i = 19; i > 0; i--)
{
LMC_CSR_WRITE (sc, csr_9, 0x40000);
lmc_delay ();
- /* __SLOW_DOWN_IO; */
retval = (retval << 1) | ((LMC_CSR_READ (sc, csr_9) & 0x80000) ? 1 : 0);
LMC_CSR_WRITE (sc, csr_9, 0x40000 | 0x10000);
lmc_delay ();
- /* __SLOW_DOWN_IO; */
}
return (retval >> 1) & 0xffff;
@@ -1708,10 +1704,8 @@ void lmc_mii_writereg (lmc_softc_t * const sc, unsigned devaddr, unsigned regno,
LMC_CSR_WRITE (sc, csr_9, datav);
lmc_delay ();
- /* __SLOW_DOWN_IO; */
LMC_CSR_WRITE (sc, csr_9, (datav | 0x10000));
lmc_delay ();
- /* __SLOW_DOWN_IO; */
i--;
}
@@ -1720,10 +1714,8 @@ void lmc_mii_writereg (lmc_softc_t * const sc, unsigned devaddr, unsigned regno,
{
LMC_CSR_WRITE (sc, csr_9, 0x40000);
lmc_delay ();
- /* __SLOW_DOWN_IO; */
LMC_CSR_WRITE (sc, csr_9, 0x50000);
lmc_delay ();
- /* __SLOW_DOWN_IO; */
i--;
}
}
diff --git a/drivers/net/wan/lmc/lmc_var.h b/drivers/net/wan/lmc/lmc_var.h
index 99f0aa787a35..cf824bb1932c 100644
--- a/drivers/net/wan/lmc/lmc_var.h
+++ b/drivers/net/wan/lmc/lmc_var.h
@@ -44,14 +44,6 @@ typedef struct lmc___ctl lmc_ctl_t;
#define LMC_CSR_WRITE(sc, reg, val) \
outl((val), (sc)->lmc_csrs.reg)
-//#ifdef _LINUX_DELAY_H
-// #define SLOW_DOWN_IO udelay(2);
-// #undef __SLOW_DOWN_IO
-// #define __SLOW_DOWN_IO udelay(2);
-//#endif
-
-#define DELAY(n) SLOW_DOWN_IO
-
#define lmc_delay() inl(sc->lmc_csrs.csr_9)
/* This macro sync's up with the mii so that reads and writes can take place */
--
2.25.1
next prev parent reply other threads:[~2022-04-15 19:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-15 19:08 [PATCH 0/7] Remove unused SLOW_DOWN_IO Bjorn Helgaas
2022-04-15 19:08 ` [PATCH 1/7] net: wan: atp: remove unused eeprom_delay() Bjorn Helgaas
2022-04-15 19:08 ` Bjorn Helgaas [this message]
2022-04-15 19:08 ` [PATCH 3/7] net: remove comments that mention obsolete __SLOW_DOWN_IO Bjorn Helgaas
2022-04-15 19:08 ` [PATCH 4/7] sh: remove unused SLOW_DOWN_IO Bjorn Helgaas
2022-04-15 19:08 ` [PATCH 5/7] powerpc: Remove unused SLOW_DOWN_IO definition Bjorn Helgaas
2022-04-15 19:08 ` [PATCH 6/7] ia64: remove unused __SLOW_DOWN_IO and SLOW_DOWN_IO definitions Bjorn Helgaas
2022-04-15 19:08 ` [PATCH 7/7] alpha: " Bjorn Helgaas
2022-04-22 17:48 ` [PATCH 0/7] Remove unused SLOW_DOWN_IO Jakub Kicinski
2022-04-25 21:16 ` Bjorn Helgaas
2022-05-15 10:12 ` (subset) " Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220415190817.842864-3-helgaas@kernel.org \
--to=helgaas@kernel.org \
--cc=3chas3@gmail.com \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=dalias@libc.org \
--cc=davem@davemloft.net \
--cc=ink@jurassic.park.msu.ru \
--cc=kuba@kernel.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-atm-general@lists.sourceforge.net \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mattst88@gmail.com \
--cc=mpe@ellerman.id.au \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=paulus@samba.org \
--cc=rth@twiddle.net \
--cc=ysato@users.sourceforge.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).