* [PATCH 0/2] net: Remove unused __SLOW_DOWN_IO
@ 2022-04-25 21:26 Bjorn Helgaas
2022-04-25 21:26 ` [PATCH 1/2] net: wan: atp: remove unused eeprom_delay() Bjorn Helgaas
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2022-04-25 21:26 UTC (permalink / raw)
To: Jakub Kicinski, David S . Miller, Paolo Abeni, Chas Williams
Cc: linux-atm-general, netdev, linux-kernel, Bjorn Helgaas
From: Bjorn Helgaas <bhelgaas@google.com>
Remove unused mentions of __SLOW_DOWN_IO.
Bjorn Helgaas (2):
net: wan: atp: remove unused eeprom_delay()
net: remove comments that mention obsolete __SLOW_DOWN_IO
drivers/atm/nicstarmac.c | 5 -----
drivers/net/ethernet/dec/tulip/winbond-840.c | 2 --
drivers/net/ethernet/natsemi/natsemi.c | 2 --
drivers/net/ethernet/realtek/atp.h | 4 ----
4 files changed, 13 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] net: wan: atp: remove unused eeprom_delay()
2022-04-25 21:26 [PATCH 0/2] net: Remove unused __SLOW_DOWN_IO Bjorn Helgaas
@ 2022-04-25 21:26 ` Bjorn Helgaas
2022-04-25 21:26 ` [PATCH 2/2] net: remove comments that mention obsolete __SLOW_DOWN_IO Bjorn Helgaas
2022-04-27 0:50 ` [PATCH 0/2] net: Remove unused __SLOW_DOWN_IO patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2022-04-25 21:26 UTC (permalink / raw)
To: Jakub Kicinski, David S . Miller, Paolo Abeni, Chas Williams
Cc: linux-atm-general, netdev, linux-kernel, Bjorn Helgaas
From: Bjorn Helgaas <bhelgaas@google.com>
atp.h is included only by atp.c, which does not use eeprom_delay(). Remove
the unused definition.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
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)
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] net: remove comments that mention obsolete __SLOW_DOWN_IO
2022-04-25 21:26 [PATCH 0/2] net: Remove unused __SLOW_DOWN_IO Bjorn Helgaas
2022-04-25 21:26 ` [PATCH 1/2] net: wan: atp: remove unused eeprom_delay() Bjorn Helgaas
@ 2022-04-25 21:26 ` Bjorn Helgaas
2022-04-27 0:50 ` [PATCH 0/2] net: Remove unused __SLOW_DOWN_IO patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Bjorn Helgaas @ 2022-04-25 21:26 UTC (permalink / raw)
To: Jakub Kicinski, David S . Miller, Paolo Abeni, Chas Williams
Cc: linux-atm-general, netdev, linux-kernel, Bjorn Helgaas
From: Bjorn Helgaas <bhelgaas@google.com>
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 <bhelgaas@google.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] net: Remove unused __SLOW_DOWN_IO
2022-04-25 21:26 [PATCH 0/2] net: Remove unused __SLOW_DOWN_IO Bjorn Helgaas
2022-04-25 21:26 ` [PATCH 1/2] net: wan: atp: remove unused eeprom_delay() Bjorn Helgaas
2022-04-25 21:26 ` [PATCH 2/2] net: remove comments that mention obsolete __SLOW_DOWN_IO Bjorn Helgaas
@ 2022-04-27 0:50 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-04-27 0:50 UTC (permalink / raw)
To: Bjorn Helgaas
Cc: kuba, davem, pabeni, 3chas3, linux-atm-general, netdev,
linux-kernel, bhelgaas
Hello:
This series was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Mon, 25 Apr 2022 16:26:42 -0500 you wrote:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> Remove unused mentions of __SLOW_DOWN_IO.
>
> Bjorn Helgaas (2):
> net: wan: atp: remove unused eeprom_delay()
> net: remove comments that mention obsolete __SLOW_DOWN_IO
>
> [...]
Here is the summary with links:
- [1/2] net: wan: atp: remove unused eeprom_delay()
https://git.kernel.org/netdev/net-next/c/dac173db114d
- [2/2] net: remove comments that mention obsolete __SLOW_DOWN_IO
https://git.kernel.org/netdev/net-next/c/e39f63fe0d94
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-27 0:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-25 21:26 [PATCH 0/2] net: Remove unused __SLOW_DOWN_IO Bjorn Helgaas
2022-04-25 21:26 ` [PATCH 1/2] net: wan: atp: remove unused eeprom_delay() Bjorn Helgaas
2022-04-25 21:26 ` [PATCH 2/2] net: remove comments that mention obsolete __SLOW_DOWN_IO Bjorn Helgaas
2022-04-27 0:50 ` [PATCH 0/2] net: Remove unused __SLOW_DOWN_IO patchwork-bot+netdevbpf
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).