[PATCH] watchdog: geodewdt: Use platform_driver_probe

[PATCH] watchdog: geodewdt: Use platform_driver_probe

[Jean Delvare]

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>
Cc: Wim Van Sebroeck <wim@iguana.be>
---
 drivers/watchdog/geodewdt.c |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

--- linux-3.14-rc6.orig/drivers/watchdog/geodewdt.c	2014-01-20 03:40:07.000000000 +0100
+++ linux-3.14-rc6/drivers/watchdog/geodewdt.c	2014-03-14 10:41:42.415355724 +0100
@@ -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;
 }
 


-- 
Jean Delvare
SUSE L3 Support

Re: [PATCH] watchdog: geodewdt: Use platform_driver_probe

[Guenter Roeck]

On Fri, Mar 14, 2014 at 01:16:47PM +0100, Jean Delvare wrote:
> 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>
> Cc: Wim Van Sebroeck <wim@iguana.be>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

Re: [PATCH] watchdog: geodewdt: Use platform_driver_probe

[Wim Van Sebroeck]

Hi Jean,

> 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>
> Cc: Wim Van Sebroeck <wim@iguana.be>
> ---
>  drivers/watchdog/geodewdt.c |   17 +++++++----------
>  1 file changed, 7 insertions(+), 10 deletions(-)
> 
> --- linux-3.14-rc6.orig/drivers/watchdog/geodewdt.c	2014-01-20 03:40:07.000000000 +0100
> +++ linux-3.14-rc6/drivers/watchdog/geodewdt.c	2014-03-14 10:41:42.415355724 +0100
> @@ -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;
>  }
>  
> 
> 

Patch has been added to linux-watchdog-next.

Kind regards,
Wim.