[PATCH v3 07/11] watchdog: xilinx: Use of_property_read_u32

[Guenter Roeck]

Hi Michal,

On Wed, Feb 12, 2014 at 02:41:21PM +0100, Michal Simek wrote:
> Use of_property_read_u32 functions to clean probe function.
> 
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> Reviewed-by: Guenter Roeck <linux at roeck-us.net>
> ---
> 
> Changes in v3:
> - Remove one if checking and use variable directly
> 

Looks good.

Another comment/remark.

> 
> -	pfreq = (u32 *)of_get_property(pdev->dev.of_node,
> -					"clock-frequency", NULL);
> -
> -	if (pfreq == NULL) {
> +	rc = of_property_read_u32(pdev->dev.of_node, "clock-frequency", &pfreq);
> +	if (rc) {
>  		dev_warn(&pdev->dev,
>  			 "The watchdog clock frequency cannot be obtained\n");
>  		no_timeout = true;
>  	}
> 
> -	tmptr = (u32 *)of_get_property(pdev->dev.of_node,
> -					"xlnx,wdt-interval", NULL);
> -	if (tmptr == NULL) {
> +	rc = of_property_read_u32(pdev->dev.of_node, "xlnx,wdt-interval",
> +				  &xdev->wdt_interval);
> +	if (rc) {
>  		dev_warn(&pdev->dev,
>  			 "Parameter \"xlnx,wdt-interval\" not found\n");
>  		no_timeout = true;
> -	} else {
> -		xdev->wdt_interval = *tmptr;
>  	}
> 
> -	tmptr = (u32 *)of_get_property(pdev->dev.of_node,
> -					"xlnx,wdt-enable-once", NULL);
> -	if (tmptr == NULL) {
> +	rc = of_property_read_u32(pdev->dev.of_node, "xlnx,wdt-enable-once",
> +				  &enable_once);
> +	if (rc)
>  		dev_warn(&pdev->dev,
>  			 "Parameter \"xlnx,wdt-enable-once\" not found\n");
> -		watchdog_set_nowayout(xilinx_wdt_wdd, true);
> -	}

All the above properties are optional. Is a warning really
warranted in this case ? I usually associate a warning with
something that is wrong, which is not the case here.

I would encourage you to drop those warnings, but that should be
a separate patch.

Thanks,
Guenter