From patchwork Fri Jan 31 14:18:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 3561901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CBC509F2E9 for ; Fri, 31 Jan 2014 14:47:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BEEB92021A for ; Fri, 31 Jan 2014 14:47:20 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9301220213 for ; Fri, 31 Jan 2014 14:47:19 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W9Ey2-000211-3z; Fri, 31 Jan 2014 14:21:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W9ExP-00019I-Su; Fri, 31 Jan 2014 14:20:35 +0000 Received: from mail-ea0-f180.google.com ([209.85.215.180]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W9Ew6-0000x9-Rr for linux-arm-kernel@lists.infradead.org; Fri, 31 Jan 2014 14:19:16 +0000 Received: by mail-ea0-f180.google.com with SMTP id o10so2376786eaj.11 for ; Fri, 31 Jan 2014 06:18:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references:content-type; bh=gc0tCfpJXo3rjuzGaoSWN1q4MCUPsrLC3vKocaegmGs=; b=TyXe15MvjDZ5/rHiR0RWhfnF45VXaBLQKsYRg8TzprsIAPoTdIWWlpf1XeHqFjyb+9 OCaNQfYUl1m1J8jTQMjXaj6HQfHgC0H5aZBLStrgRNQqyYeb24RokZhB4yqSep+WoLbP fS3sX1/0hqKgfWiIaXT50bVZ8NRAn9aB53P9/3LhR8EHeGcBMm+/umNTb7AW/JQrdJRY uBGklKPz9RShmSAdrizEHK9PY7ed9ffAkQkFmARRd9sXAeMGer3XTcKqDY4siLiGmcPu XZ0Ur/Bqj2d15MIaoBuKIJd46QQ/LPfESHOkQmv+jCvvMHlcZV4y3yfYD9oLF3WnNCBt Y3MA== X-Gm-Message-State: ALoCoQlw/75H3Dd9FhMCSji0ZdJh6SE6FK9kkCsSq5RVFAnVGIs9eyUsmMrS+XdcB4TiHcpXqUaX X-Received: by 10.15.43.141 with SMTP id x13mr24596865eev.35.1391177930862; Fri, 31 Jan 2014 06:18:50 -0800 (PST) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id k41sm36821429eey.0.2014.01.31.06.18.49 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Fri, 31 Jan 2014 06:18:49 -0800 (PST) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu Subject: [PATCH 07/10] watchdog: xilinx: Fix OF binding Date: Fri, 31 Jan 2014 15:18:16 +0100 Message-Id: <26d172891694e4041e73b7dae85a1848adf38034.1391177880.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.8.2.3 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140131_091915_127615_0595B5E4 X-CRM114-Status: GOOD ( 12.70 ) X-Spam-Score: -1.9 (-) Cc: devicetree@vger.kernel.org, linux-watchdog@vger.kernel.org, Wim Van Sebroeck , Rob Herring , Grant Likely , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use of_property_read_u32 functions to clean OF probing. Signed-off-by: Michal Simek Reviewed-by: Guenter Roeck --- drivers/watchdog/of_xilinx_wdt.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) -- 1.8.2.3 diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c index c229cc4..475440a6 100644 --- a/drivers/watchdog/of_xilinx_wdt.c +++ b/drivers/watchdog/of_xilinx_wdt.c @@ -147,8 +147,7 @@ static u32 xwdt_selftest(struct xwdt_device *xdev) static int xwdt_probe(struct platform_device *pdev) { int rc; - u32 *tmptr; - u32 *pfreq; + u32 pfreq, enable_once; struct resource *res; struct xwdt_device *xdev; bool no_timeout = false; @@ -168,28 +167,24 @@ static int xwdt_probe(struct platform_device *pdev) if (IS_ERR(xdev->base)) return PTR_ERR(xdev->base); - 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 && enable_once) { dev_warn(&pdev->dev, "Parameter \"xlnx,wdt-enable-once\" not found\n"); watchdog_set_nowayout(xilinx_wdt_wdd, true); @@ -201,7 +196,7 @@ static int xwdt_probe(struct platform_device *pdev) */ if (!no_timeout) xilinx_wdt_wdd->timeout = 2 * ((1 << xdev->wdt_interval) / - *pfreq); + pfreq); spin_lock_init(&xdev->spinlock); watchdog_set_drvdata(xilinx_wdt_wdd, xdev);