Skip to content

drivers/net/Space.c cleanup

Arnd Bergmann lkml netdev 2 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (refs/heads/master):

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest14 patches 5 repliesApplied 14/14
  2. v1 RFC13 patches 11 repliesSuperseded

Changes in v2 from the cover letter

- replace xsurf100 change with Michael's version
- make it PATCH instead of RFC
- rebase to net-next as of August 3

Patches in v2 All 14 applied

#Subject and filesSizeRepliesApplied
1/14bcmgenet: remove call to netdev_boot_setup_checkdrivers/net/ethernet/broadcom/genet/bcmgenet.c+0 -20 repliesApplied
2/14natsemi: sonic: stop calling netdev_boot_setup_checkdrivers/net/ethernet/natsemi/jazzsonic.c drivers/net/ethernet/natsemi/xtsonic.c+0 -30 repliesApplied
3/14appletalk: ltpc: remove static probingdrivers/net/Space.c drivers/net/appletalk/ltpc.c include/net/Space.h+2 -90 repliesApplied
4/143c509: stop calling netdev_boot_setup_checkdrivers/net/ethernet/3com/3c509.c+0 -30 repliesApplied
5/14cs89x0: rework driver configurationdrivers/net/Space.c drivers/net/ethernet/cirrus/Kconfig drivers/net/ethernet/cirrus/cs89x0.c+28 -261 replyApplied
6/14m68k: remove legacy probingdrivers/net/Space.c drivers/net/ethernet/8390/apne.c drivers/net/ethernet/amd/atarilance.c +5 more+30 -990 repliesApplied
7/14ax88796: export ax_NS8390_init() hookdrivers/net/ethernet/8390/ax88796.c include/net/ax88796.h+10 -00 repliesApplied
8/14xsurf100: drop include of lib8390.cdrivers/net/ethernet/8390/xsurf100.c init/main.c+5 -101 replyApplied
9/14move netdev_boot_setup into Space.cdrivers/net/Space.c include/linux/netdevice.h net/core/dev.c +1 more+142 -1400 repliesApplied
10/14make legacy ISA probe optionaldrivers/net/Kconfig drivers/net/Makefile drivers/net/appletalk/Kconfig +6 more+22 -23 repliesApplied
11/14wan: remove stale Kconfig entriesdrivers/net/wan/Kconfig+0 -240 repliesApplied
12/14wan: remove sbni/granch driverDocumentation/admin-guide/kernel-parameters.txt drivers/net/Space.c drivers/net/wan/Kconfig +4 more+0 -18230 repliesApplied
13/14wan: hostess_sv11: use module_init/module_exit helpersdrivers/net/wan/hostess_sv11.c+4 -20 repliesApplied
14/14ethernet: isa: convert to module_init/module_exitdrivers/net/ethernet/3com/3c515.c drivers/net/ethernet/8390/ne.c drivers/net/ethernet/8390/smc-ultra.c +5 more+28 -190 repliesApplied

Reviews trailers per patch

2 of 14 patches have a Reviewed-by or Acked-by.

PatchFlorian FainelliGeert Uytterhoeven
1/14A-b
2/14
3/14
4/14
5/14
6/14R-b
7/14
8/14
9/14
10/14
11/14
12/14
13/14
14/14

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/14] [net-next] drivers/net/Space.c cleanup

From: Arnd Bergmann <[email protected]>

I discovered that there are still a couple of drivers that rely on beiong statically initialized from drivers/net/Space.c the way we did in the last century. As it turns out, there are a couple of simplifications that can be made here, as well as some minor bugfixes.

There are four classes of drivers that use this:

- most 10mbit ISA bus ethernet drivers (and one 100mbit one)
- both ISA localtalk drivers
- several m68k ethernet drivers
- one obsolete WAN driver

I found that the drivers using in arch/m68k/ don't actually benefit from being probed this way as they do not rely on the netdev= command line arguments, they have simply never been changed to work like a modern driver.

I had previously sent a patch to remove the sbni/granch driver, and there were no objections to this patch but forgot to resend it after some discussion about another patch in the same series.

For the ISA drivers, there is usually no way to probe multiple devices at boot time other than the netdev= arguments, so all that logic is left in place for the moment, but centralized in a single file that only gets included in the kernel build if one or more of the drivers are built-in.

I'm also changing the old-style init_module() functions in these drivers to static functions with a module_init() annotation, to more closely resemble modern drivers. These are the last drivers in the kernel to still use init_module/cleanup_module, removing those may enable future cleanups to the module loading process.

Arnd

Changes in v2:

- replace xsurf100 change with Michael's version
- make it PATCH instead of RFC
- rebase to net-next as of August 3

Arnd Bergmann (12):
[net-next] bcmgenet: remove call to netdev_boot_setup_check [net-next] natsemi: sonic: stop calling netdev_boot_setup_check [net-next] appletalk: ltpc: remove static probing [net-next] 3c509: stop calling netdev_boot_setup_check [net-next] cs89x0: rework driver configuration [net-next] m68k: remove legacy probing
[net-next] move netdev_boot_setup into Space.c [net-next] make legacy ISA probe optional
[net-next] wan: remove stale Kconfig entries [net-next] wan: remove sbni/granch driver
[net-next] wan: hostess_sv11: use module_init/module_exit helpers [net-next] ethernet: isa: convert to module_init/module_exit

Michael Schmitz (2):
[net-next] ax88796: export ax_NS8390_init() hook [net-next] xsurf100: drop include of lib8390.c

 .../admin-guide/kernel-parameters.txt         |    2 -
 drivers/net/Kconfig                           |    7 +
 drivers/net/Makefile                          |    3 +-
 drivers/net/Space.c                           |  178 +-
 drivers/net/appletalk/Kconfig                 |    4 +-
 drivers/net/appletalk/ltpc.c                  |    7 +-
 drivers/net/ethernet/3com/3c509.c             |    3 -
 drivers/net/ethernet/3com/3c515.c             |    3 +-
 drivers/net/ethernet/3com/Kconfig             |    1 +
 drivers/net/ethernet/8390/Kconfig             |    3 +
 drivers/net/ethernet/8390/apne.c              |   11 +-
 drivers/net/ethernet/8390/ax88796.c           |    7 +
 drivers/net/ethernet/8390/ne.c                |    5 +-
 drivers/net/ethernet/8390/smc-ultra.c         |    9 +-
 drivers/net/ethernet/8390/wd.c                |    7 +-
 drivers/net/ethernet/8390/xsurf100.c          |    9 +-
 drivers/net/ethernet/amd/Kconfig              |    2 +
 drivers/net/ethernet/amd/atarilance.c         |   11 +-
 drivers/net/ethernet/amd/lance.c              |    6 +-
 drivers/net/ethernet/amd/mvme147.c            |   16 +-
 drivers/net/ethernet/amd/ni65.c               |    6 +-
 drivers/net/ethernet/amd/sun3lance.c          |   19 +-
 .../net/ethernet/broadcom/genet/bcmgenet.c    |    2 -
 drivers/net/ethernet/cirrus/Kconfig           |   27 +-
 drivers/net/ethernet/cirrus/cs89x0.c          |   31 +-
 drivers/net/ethernet/i825xx/82596.c           |   24 +-
 drivers/net/ethernet/i825xx/sun3_82586.c      |   17 +-
 drivers/net/ethernet/natsemi/jazzsonic.c      |    2 -
 drivers/net/ethernet/natsemi/xtsonic.c        |    1 -
 drivers/net/ethernet/smsc/Kconfig             |    1 +
 drivers/net/ethernet/smsc/smc9194.c           |    6 +-
 drivers/net/wan/Kconfig                       |   51 -
 drivers/net/wan/Makefile                      |    1 -
 drivers/net/wan/hostess_sv11.c                |    6 +-
 drivers/net/wan/sbni.c                        | 1639 -----------------
 drivers/net/wan/sbni.h                        |  147 --
 include/linux/netdevice.h                     |   13 -
 include/net/Space.h                           |   10 -
 include/net/ax88796.h                         |    3 +
 init/main.c                                   |    6 +-
 net/core/dev.c                                |  125 --
 net/ethernet/eth.c                            |    2 -
 42 files changed, 271 insertions(+), 2162 deletions(-)
 delete mode 100644 drivers/net/wan/sbni.c
 delete mode 100644 drivers/net/wan/sbni.h
Signature · 22 lines
2.29.2

Cc: "David S. Miller" <[email protected]>
Cc: "Maciej W. Rozycki" <[email protected]>
Cc: Alexei Starovoitov <[email protected]>
Cc: Andrew Lunn <[email protected]>
Cc: Andrii Nakryiko <[email protected]>
Cc: Bartosz Golaszewski <[email protected]>
Cc: Christophe JAILLET <[email protected]>
Cc: Doug Berger <[email protected]>
Cc: Eric Dumazet <[email protected]>
Cc: Finn Thain <[email protected]>
Cc: Florian Fainelli <[email protected]>
Cc: Geert Uytterhoeven <[email protected]>
Cc: Jakub Kicinski <[email protected]>
Cc: Jessica Yu <[email protected]>
Cc: Michael Schmitz <[email protected]>
Cc: Paul Gortmaker <[email protected]>
Cc: Sam Creasey <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]