From patchwork Fri Jan 31 14:18:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 3561821 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 0F4C49F382 for ; Fri, 31 Jan 2014 14:21:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EBFF62022A for ; Fri, 31 Jan 2014 14:21:50 +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 AEA1520213 for ; Fri, 31 Jan 2014 14:21:49 +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 1W9ExC-0001Vn-EI; Fri, 31 Jan 2014 14:20:23 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W9Ewo-00016B-9y; Fri, 31 Jan 2014 14:19:58 +0000 Received: from mail-ea0-f178.google.com ([209.85.215.178]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W9Ew4-0000x5-A9 for linux-arm-kernel@lists.infradead.org; Fri, 31 Jan 2014 14:19:13 +0000 Received: by mail-ea0-f178.google.com with SMTP id a15so2337601eae.23 for ; Fri, 31 Jan 2014 06:18:50 -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=7IkqdcaBZuu2QnXnEYjs0PdlCZdzyfHAXCNUbvD9dPc=; b=fxK62IfXMsxtgZjwF/A/1NDyaiPoZDwX9GgEcXGIfbYX411G+rbX+7B04aqs9ONkIf kirpwfTe/bNtMNmikv/Qh7yQUvepP5j/Vh4dJlZNfoCElhduuUedG8zv8CXd8kzbnLHN C1B0DsmIH2PIc5NEHOcUoH3zyZApgkHg1LydaZrN9sZv2HTWhvKfY4m0CHYAs3sMZpwS eo3V2anl9yBu1+GEKWahWqCc8rshzYupqLWh7x/wrPW47usyJKUcUFRXuFy/CHLwkPXw /ZJLhlVnjAAS57ji0k/eihO4lgccoFQ+kZ5HQq/+M4zenduyVGoK1gJwfWMdPzWCePnf Qf7A== X-Gm-Message-State: ALoCoQnDb33cgMPe+qxPTDtanapAX/S6XcmtIPdiX74GspI7MhrpS6eWIeL0QiJS2jj72hwSe7pN X-Received: by 10.14.0.201 with SMTP id 49mr25213350eeb.38.1391177927908; Fri, 31 Jan 2014 06:18:47 -0800 (PST) Received: from localhost (nat-63.starnet.cz. [178.255.168.63]) by mx.google.com with ESMTPSA id w4sm37313885eef.20.2014.01.31.06.18.46 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Fri, 31 Jan 2014 06:18:46 -0800 (PST) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu Subject: [PATCH 06/10] watchdog: xilinx: Fix all printk messages Date: Fri, 31 Jan 2014 15:18:15 +0100 Message-Id: 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_091912_587583_260CEB22 X-CRM114-Status: GOOD ( 12.89 ) X-Spam-Score: -1.9 (-) Cc: Wim Van Sebroeck , linux-watchdog@vger.kernel.org, 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 dev_ functions for printk messages. Signed-off-by: Michal Simek Reviewed-by: Guenter Roeck --- drivers/watchdog/of_xilinx_wdt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 1.8.2.3 diff --git a/drivers/watchdog/of_xilinx_wdt.c b/drivers/watchdog/of_xilinx_wdt.c index d28bd3f..c229cc4 100644 --- a/drivers/watchdog/of_xilinx_wdt.c +++ b/drivers/watchdog/of_xilinx_wdt.c @@ -10,8 +10,6 @@ * 2 of the License, or (at your option) any later version. */ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - #include #include #include @@ -42,7 +40,6 @@ #define XWT_TIMER_FAILED 0xFFFFFFFF #define WATCHDOG_NAME "Xilinx Watchdog" -#define PFX WATCHDOG_NAME ": " struct xwdt_device { void __iomem *base; @@ -175,14 +172,16 @@ static int xwdt_probe(struct platform_device *pdev) "clock-frequency", NULL); if (pfreq == NULL) { - pr_warn("The watchdog clock frequency cannot be obtained!\n"); + 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) { - pr_warn("Parameter \"xlnx,wdt-interval\" not found in device tree!\n"); + dev_warn(&pdev->dev, + "Parameter \"xlnx,wdt-interval\" not found\n"); no_timeout = true; } else { xdev->wdt_interval = *tmptr; @@ -191,7 +190,8 @@ static int xwdt_probe(struct platform_device *pdev) tmptr = (u32 *)of_get_property(pdev->dev.of_node, "xlnx,wdt-enable-once", NULL); if (tmptr == NULL) { - pr_warn("Parameter \"xlnx,wdt-enable-once\" not found in device tree!\n"); + dev_warn(&pdev->dev, + "Parameter \"xlnx,wdt-enable-once\" not found\n"); watchdog_set_nowayout(xilinx_wdt_wdd, true); } @@ -208,13 +208,13 @@ static int xwdt_probe(struct platform_device *pdev) rc = xwdt_selftest(xdev); if (rc == XWT_TIMER_FAILED) { - pr_err("SelfTest routine error!\n"); + dev_err(&pdev->dev, "SelfTest routine error\n"); return rc; } rc = watchdog_register_device(xilinx_wdt_wdd); if (rc) { - pr_err("cannot register watchdog (err=%d)\n", rc); + dev_err(&pdev->dev, "Cannot register watchdog (err=%d)\n", rc); return rc; }