Skip to content

Commit

Permalink
appletalk: ltpc: remove static probing
Browse files Browse the repository at this point in the history
This driver never relies on the netdev_boot_setup_check()
to get its configuration, so it can just as well do its
own probing all the time.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Arnd Bergmann authored and David S. Miller committed Aug 3, 2021
1 parent 19a11bf commit 81dd3ee
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
3 changes: 0 additions & 3 deletions drivers/net/Space.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,6 @@ static int __init net_olddevs_init(void)
cops_probe(1);
cops_probe(2);
#endif
#ifdef CONFIG_LTPC
ltpc_probe();
#endif

return 0;
}
Expand Down
7 changes: 2 additions & 5 deletions drivers/net/appletalk/ltpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,7 @@ static const struct net_device_ops ltpc_netdev = {
.ndo_set_rx_mode = set_multicast_list,
};

struct net_device * __init ltpc_probe(void)
static struct net_device * __init ltpc_probe(void)
{
struct net_device *dev;
int err = -ENOMEM;
Expand Down Expand Up @@ -1221,12 +1221,10 @@ static int __init ltpc_setup(char *str)
}

__setup("ltpc=", ltpc_setup);
#endif /* MODULE */
#endif

static struct net_device *dev_ltpc;

#ifdef MODULE

MODULE_LICENSE("GPL");
module_param(debug, int, 0);
module_param_hw(io, int, ioport, 0);
Expand All @@ -1244,7 +1242,6 @@ static int __init ltpc_module_init(void)
return PTR_ERR_OR_ZERO(dev_ltpc);
}
module_init(ltpc_module_init);
#endif

static void __exit ltpc_cleanup(void)
{
Expand Down
1 change: 0 additions & 1 deletion include/net/Space.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ struct net_device *mvme147lance_probe(int unit);
struct net_device *tc515_probe(int unit);
struct net_device *lance_probe(int unit);
struct net_device *cops_probe(int unit);
struct net_device *ltpc_probe(void);

/* Fibre Channel adapters */
int iph5526_probe(struct net_device *dev);
Expand Down

0 comments on commit 81dd3ee

Please sign in to comment.