redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

watchdog: xilinx: Use of_property_read_u32

Browse source 
Use of_property_read_u32 functions to clean probe function.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Michal Simek 2014-02-12 14:41:21 +01:00 committed by Wim Van Sebroeck
parent 4c7fbbc4a5
commit 2e79a36847
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/watchdog/of_xilinx_wdt.c
View file

@ -146,8 +146,7 @@ static u32 xwdt_selftest(struct xwdt_device *xdev)
static int xwdt_probe(struct platform_device *pdev) static int xwdt_probe(struct platform_device *pdev)
{ {
int rc; int rc;
u32 *tmptr; u32 pfreq, enable_once = 0;
u32 *pfreq;
struct resource *res; struct resource *res;
struct xwdt_device *xdev; struct xwdt_device *xdev;
bool no_timeout = false; bool no_timeout = false;
@ -167,32 +166,28 @@ static int xwdt_probe(struct platform_device *pdev)
if (IS_ERR(xdev->base)) if (IS_ERR(xdev->base))
return PTR_ERR(xdev->base); return PTR_ERR(xdev->base);
pfreq = (u32 *)of_get_property(pdev->dev.of_node, rc = of_property_read_u32(pdev->dev.of_node, "clock-frequency", &pfreq);
"clock-frequency", NULL); if (rc) {
if (pfreq == NULL) {
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"The watchdog clock frequency cannot be obtained\n"); "The watchdog clock frequency cannot be obtained\n");
no_timeout = true; no_timeout = true;
} }
tmptr = (u32 *)of_get_property(pdev->dev.of_node, rc = of_property_read_u32(pdev->dev.of_node, "xlnx,wdt-interval",
"xlnx,wdt-interval", NULL); &xdev->wdt_interval);
if (tmptr == NULL) { if (rc) {
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"Parameter \"xlnx,wdt-interval\" not found\n"); "Parameter \"xlnx,wdt-interval\" not found\n");
no_timeout = true; no_timeout = true;
} else {
xdev->wdt_interval = *tmptr;
} }
tmptr = (u32 *)of_get_property(pdev->dev.of_node, rc = of_property_read_u32(pdev->dev.of_node, "xlnx,wdt-enable-once",
"xlnx,wdt-enable-once", NULL); &enable_once);
if (tmptr == NULL) { if (rc)
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"Parameter \"xlnx,wdt-enable-once\" not found\n"); "Parameter \"xlnx,wdt-enable-once\" not found\n");
watchdog_set_nowayout(xilinx_wdt_wdd, true);
} watchdog_set_nowayout(xilinx_wdt_wdd, enable_once);
/* /*
* Twice of the 2^wdt_interval / freq because the first wdt overflow is * Twice of the 2^wdt_interval / freq because the first wdt overflow is
@ -200,7 +195,7 @@ static int xwdt_probe(struct platform_device *pdev)
*/ */
if (!no_timeout) if (!no_timeout)
xilinx_wdt_wdd->timeout = 2 * ((1 << xdev->wdt_interval) / xilinx_wdt_wdd->timeout = 2 * ((1 << xdev->wdt_interval) /
*pfreq); pfreq);
spin_lock_init(&xdev->spinlock); spin_lock_init(&xdev->spinlock);
watchdog_set_drvdata(xilinx_wdt_wdd, xdev); watchdog_set_drvdata(xilinx_wdt_wdd, xdev);