watchdog: geodewdt: Use platform_driver_probe
PATCH 1/1 watchdog: geodewdt: Use platform_driver_probe
Using platform_driver_probe instead of platform_driver_register has two benefits:
* The driver will fail to load if device probing fails.
* The probe function can be marked __init.
Signed-off-by Jean Delvare <[email protected]>
Cc Wim Van Sebroeck <[email protected]>
--- drivers/watchdog/geodewdt.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/watchdog/geodewdt.c +7 -10
@@ -215,7 +215,7 @@ static struct miscdevice geodewdt_miscde .fops = &geodewdt_fops, }; -static int geodewdt_probe (struct platform_device *dev) +static int __init geodewdt_probe (struct platform_device *dev) {int ret;
@@ -255,7 +255,6 @@ static void geodewdt_shutdown(struct pla }static struct platform_driver geodewdt_driver = { - .probe = geodewdt_probe, .remove = geodewdt_remove, .shutdown = geodewdt_shutdown, .driver = {
@@ -268,20 +267,18 @@ static int __init geodewdt_init(void) {int ret; - ret =platform_driver_register (&geodewdt_driver); -if (ret) -return ret; - geodewdt_platform_device =platform_device_register_simple (DRV_NAME ,-1 ,NULL ,0 ); -if (IS_ERR (geodewdt_platform_device)) { - ret =PTR_ERR (geodewdt_platform_device); +if (IS_ERR (geodewdt_platform_device)) +return PTR_ERR (geodewdt_platform_device); + + ret =platform_driver_probe (&geodewdt_driver, geodewdt_probe); +if (ret) goto err; - }return 0 ; err: -platform_driver_unregister (&geodewdt_driver); +platform_device_unregister (geodewdt_platform_device);return ret; }
Signature · 2 lines
Jean Delvare SUSE L3 Support
Quoted 7 lines · Jean Delvare
Using
platform_driver_probeinstead ofplatform_driver_registerhas two benefits:
* The driver will fail to load if device probing fails.
* The probe function can be marked__init.Signed-off-by Jean Delvare <[email protected]>Cc Wim Van Sebroeck <[email protected]>
Reviewed-by Guenter Roeck <[email protected]>
Hi Jean,
Quoted 49 lines
Using
platform_driver_probeinstead ofplatform_driver_registerhas two benefits:
* The driver will fail to load if device probing fails.
* The probe function can be marked__init.Signed-off-by Jean Delvare <[email protected]>Cc Wim Van Sebroeck <[email protected]>--- drivers/watchdog/geodewdt.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)drivers/watchdog/geodewdt.c +6
-8@@ -215,7 +215,7 @@ static struct miscdevice geodewdt_miscde .fops = &geodewdt_fops, }; -static int geodewdt_probe (struct platform_device *dev) +static int __init geodewdt_probe (struct platform_device *dev) {int ret;@@ -255,7 +255,6 @@ static void geodewdt_shutdown(struct pla }static struct platform_driver geodewdt_driver = { - .probe = geodewdt_probe, .remove = geodewdt_remove, .shutdown = geodewdt_shutdown, .driver = {@@ -268,20 +267,18 @@ static int __init geodewdt_init(void) {int ret; - ret =platform_driver_register (&geodewdt_driver); -if (ret) -return ret; - geodewdt_platform_device =platform_device_register_simple (DRV_NAME ,-1 ,NULL ,0 ); -if (IS_ERR (geodewdt_platform_device)) { - ret =PTR_ERR (geodewdt_platform_device); +if (IS_ERR (geodewdt_platform_device)) +return PTR_ERR (geodewdt_platform_device); + + ret =platform_driver_probe (&geodewdt_driver, geodewdt_probe); +if (ret)
drivers/watchdog/geodewdt.c static int __init geodewdt_init(void) · line 284
Quoted 10 lines
drivers/watchdog/geodewdt.c +1
-2goto err; - }return 0 ; err: -platform_driver_unregister (&geodewdt_driver); +platform_device_unregister (geodewdt_platform_device);return ret; }
Patch has been added to linux-watchdog-next.
Kind regards,
Wim.