Skip to content

Commit de81f74

Browse files
Uwe Kleine-KönigWim Van Sebroeck
authored andcommitted
watchdog: txx9: Stop using module_platform_driver_probe()
On today's platforms the benefit of platform_driver_probe() isn't that relevant any more. It allows to drop some code after booting (or module loading) for .probe() and discard the .remove() function completely if the driver is built-in. This typically saves a few 100k. The downside of platform_driver_probe() is that the driver cannot be bound and unbound at runtime which is ancient and also slightly complicates testing. There are also thoughts to deprecate platform_driver_probe() because it adds some complexity in the driver core for little gain. Also many drivers don't use it correctly. This driver for example misses to mark the driver struct with __refdata which is needed to suppress a (W=1) modpost warning: WARNING: modpost: drivers/watchdog/txx9wdt: section mismatch in reference: txx9wdt_driver+0x4 (section: .data) -> txx9wdt_remove (section: .exit.text) Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20231106154807.3866712-3-u.kleine-koenig@pengutronix.de Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
1 parent 86aa291 commit de81f74

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/watchdog/txx9wdt.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static struct watchdog_device txx9wdt = {
9898
.ops = &txx9wdt_ops,
9999
};
100100

101-
static int __init txx9wdt_probe(struct platform_device *dev)
101+
static int txx9wdt_probe(struct platform_device *dev)
102102
{
103103
int ret;
104104

@@ -145,7 +145,7 @@ static int __init txx9wdt_probe(struct platform_device *dev)
145145
return ret;
146146
}
147147

148-
static int __exit txx9wdt_remove(struct platform_device *dev)
148+
static int txx9wdt_remove(struct platform_device *dev)
149149
{
150150
watchdog_unregister_device(&txx9wdt);
151151
clk_disable_unprepare(txx9_imclk);
@@ -159,14 +159,14 @@ static void txx9wdt_shutdown(struct platform_device *dev)
159159
}
160160

161161
static struct platform_driver txx9wdt_driver = {
162-
.remove = __exit_p(txx9wdt_remove),
162+
.probe = txx9wdt_probe,
163+
.remove = txx9wdt_remove,
163164
.shutdown = txx9wdt_shutdown,
164165
.driver = {
165166
.name = "txx9wdt",
166167
},
167168
};
168-
169-
module_platform_driver_probe(txx9wdt_driver, txx9wdt_probe);
169+
module_platform_driver(txx9wdt_driver);
170170

171171
MODULE_DESCRIPTION("TXx9 Watchdog Driver");
172172
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)