Skip to contentSkip to conversation

net: Remove unused __SLOW_DOWN_IO

PATCH Applied Bjorn Helgaas 2 participants 4 messages Apr 25, 2022 – Apr 27, 2022

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

cover net: Remove unused __SLOW_DOWN_IO

From: Bjorn Helgaas <[email protected]>

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(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/2 net: wan: atp: remove unused eeprom_delay()

From: Bjorn Helgaas <[email protected]>

atp.h is included only by atp.c, which does not use eeprom_delay(). Remove the unused definition.

---
 drivers/net/ethernet/realtek/atp.h | 4 ----
 1 file changed, 4 deletions(-)
drivers/net/ethernet/realtek/atp.h +0 -4
index 63f0d2d0e87b..b202184eddd4 100644
@@ -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)
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/2 net: remove comments that mention obsolete __SLOW_DOWN_IO

In reply to Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

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.

---
 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(-)
drivers/atm/nicstarmac.c +0 -5
index e0dda9062e6b..791f69a07ddf 100644
@@ -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));}
 /*
drivers/net/ethernet/dec/tulip/winbond-840.c +0 -2
index 86b1d23eba83..1db19463fd46 100644
@@ -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)
 
drivers/net/ethernet/natsemi/natsemi.c +0 -2
index 82a22711ce45..50bca486a244 100644
@@ -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)
 
Signature · 1 line
2.25.1
#3 lore raw
In reply to Bjorn Helgaas
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Hello:

This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:

Quoted 9 lines · On Mon, 25 Apr 2022 16:26:42 -0500 you wrote:

From: Bjorn Helgaas <[email protected]>

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!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html