Skip to content

Commit

Permalink
watchdog: ib700wdt: Use platform_driver_probe
Browse files Browse the repository at this point in the history
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 <jdelvare@suse.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  • Loading branch information
Jean Delvare authored and Wim Van Sebroeck committed Mar 31, 2014
1 parent 78411be commit 996735f
Showing 1 changed file with 9 additions and 12 deletions.
21 changes: 9 additions & 12 deletions drivers/watchdog/ib700wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ static struct miscdevice ibwdt_miscdev = {
* Init & exit routines
*/

static int ibwdt_probe(struct platform_device *dev)
static int __init ibwdt_probe(struct platform_device *dev)
{
int res;

Expand Down Expand Up @@ -336,7 +336,6 @@ static void ibwdt_shutdown(struct platform_device *dev)
}

static struct platform_driver ibwdt_driver = {
.probe = ibwdt_probe,
.remove = ibwdt_remove,
.shutdown = ibwdt_shutdown,
.driver = {
Expand All @@ -351,21 +350,19 @@ static int __init ibwdt_init(void)

pr_info("WDT driver for IB700 single board computer initialising\n");

err = platform_driver_register(&ibwdt_driver);
if (err)
return err;

ibwdt_platform_device = platform_device_register_simple(DRV_NAME,
-1, NULL, 0);
if (IS_ERR(ibwdt_platform_device)) {
err = PTR_ERR(ibwdt_platform_device);
goto unreg_platform_driver;
}
if (IS_ERR(ibwdt_platform_device))
return PTR_ERR(ibwdt_platform_device);

err = platform_driver_probe(&ibwdt_driver, ibwdt_probe);
if (err)
goto unreg_platform_device;

return 0;

unreg_platform_driver:
platform_driver_unregister(&ibwdt_driver);
unreg_platform_device:
platform_device_unregister(ibwdt_platform_device);
return err;
}

Expand Down

0 comments on commit 996735f

Please sign in to comment.