[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210803114051.2112986-4-arnd@kernel.org>
Date: Tue, 3 Aug 2021 13:40:40 +0200
From: Arnd Bergmann <arnd@...nel.org>
To: netdev@...r.kernel.org
Cc: Arnd Bergmann <arnd@...db.de>,
"David S. Miller" <davem@...emloft.net>,
"Maciej W. Rozycki" <macro@...am.me.uk>,
Alexei Starovoitov <ast@...nel.org>,
Andrew Lunn <andrew@...n.ch>, Andrii Nakryiko <andriin@...com>,
Bartosz Golaszewski <bgolaszewski@...libre.com>,
Christophe JAILLET <christophe.jaillet@...adoo.fr>,
Doug Berger <opendmb@...il.com>,
Eric Dumazet <edumazet@...gle.com>,
Finn Thain <fthain@...egraphics.com.au>,
Florian Fainelli <f.fainelli@...il.com>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
Jakub Kicinski <kuba@...nel.org>, Jessica Yu <jeyu@...nel.org>,
Michael Schmitz <schmitzmic@...il.com>,
Paul Gortmaker <paul.gortmaker@...driver.com>,
Sam Creasey <sammy@...my.net>, linux-kernel@...r.kernel.org,
bcm-kernel-feedback-list@...adcom.com
Subject: [PATCH v2 03/14] [net-next] appletalk: ltpc: remove static probing
From: Arnd Bergmann <arnd@...db.de>
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@...db.de>
---
drivers/net/Space.c | 3 ---
drivers/net/appletalk/ltpc.c | 7 ++-----
include/net/Space.h | 1 -
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index df79e7370bcc..9196a26615cc 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -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;
}
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index 69c270885ff0..1f8925e75b3f 100644
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -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;
@@ -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);
@@ -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)
{
diff --git a/include/net/Space.h b/include/net/Space.h
index 9cce0d80d37a..e30e7a70ea99 100644
--- a/include/net/Space.h
+++ b/include/net/Space.h
@@ -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);
--
2.29.2
Powered by blists - more mailing lists