Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752299AbaBKG4R (ORCPT ); Tue, 11 Feb 2014 01:56:17 -0500 Received: from mail-ee0-f44.google.com ([74.125.83.44]:40518 "EHLO mail-ee0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751923AbaBKG4J (ORCPT ); Tue, 11 Feb 2014 01:56:09 -0500 From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu Cc: Guenter Roeck , Wim Van Sebroeck , linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 04/11] watchdog: xilinx: Move no_timeout to probe function Date: Tue, 11 Feb 2014 07:55:47 +0100 Message-Id: X-Mailer: git-send-email 1.8.2.3 In-Reply-To: References: In-Reply-To: References: Content-Type: multipart/signed; boundary="=_mimegpg-monstr-desktop-9513-1392101765-0001"; micalg=pgp-sha1; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a MIME GnuPG-signed message. If you see this text, it means that your E-mail or Usenet software does not support MIME signed messages. The Internet standard for MIME PGP messages, RFC 2015, was published in 1996. To open this message correctly you will need to install E-mail or Usenet software that supports modern Internet standards. --=_mimegpg-monstr-desktop-9513-1392101765-0001 no_timeout should be local variable because it is used only in probe function. Signed-off-by: Michal Simek Reviewed-by: Guenter Roeck --- Changes in v2: None drivers/watchdog/of_xilinx_wdt.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c index 7f371ed..1f7ad91 100644 --- a/drivers/watchdog/of_xilinx_wdt.c +++ b/drivers/watchdog/of_xilinx_wdt.c @@ -52,7 +52,6 @@ struct xwdt_device { static struct xwdt_device xdev; static u32 timeout; -static u8 no_timeout; static DEFINE_SPINLOCK(spinlock); @@ -160,8 +159,7 @@ static int xwdt_probe(struct platform_device *pdev) u32 *tmptr; u32 *pfreq; struct resource *res; - - no_timeout = 0; + bool no_timeout = false; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); xdev.base = devm_ioremap_resource(&pdev->dev, res); @@ -173,14 +171,14 @@ static int xwdt_probe(struct platform_device *pdev) if (pfreq == NULL) { pr_warn("The watchdog clock frequency cannot be obtained!\n"); - no_timeout = 1; + no_timeout = true; } tmptr = (u32 *)of_get_property(pdev->dev.of_node, "xlnx,wdt-interval", NULL); if (tmptr == NULL) { pr_warn("Parameter \"xlnx,wdt-interval\" not found in device tree!\n"); - no_timeout = 1; + no_timeout = true; } else { xdev.wdt_interval = *tmptr; } -- 1.8.2.3 --=_mimegpg-monstr-desktop-9513-1392101765-0001 Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEABECAAYFAlL5yYUACgkQykllyylKDCEHPACfRkQMkIHQJcUKsKp5wAgF66VG KKIAnRlDbsz5wyyz0boNYib1BiYHWauy =IRp+ -----END PGP SIGNATURE----- --=_mimegpg-monstr-desktop-9513-1392101765-0001-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/