Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753107AbbLXFLy (ORCPT ); Thu, 24 Dec 2015 00:11:54 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:35508 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752958AbbLXFLn (ORCPT ); Thu, 24 Dec 2015 00:11:43 -0500 From: Guenter Roeck To: linux-watchdog@vger.kernel.org Cc: Wim Van Sebroeck , Damien Riegel , linux-kernel@vger.kernel.org, Guenter Roeck Subject: [PATCH 4/5] watchdog: mena21: Do not use device pointer from struct watchdog_device Date: Wed, 23 Dec 2015 21:11:32 -0800 Message-Id: <1450933893-7761-5-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1450933893-7761-1-git-send-email-linux@roeck-us.net> References: <1450933893-7761-1-git-send-email-linux@roeck-us.net> X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1602 Lines: 49 The device pointer in struct watchdog_device has a different lifetime than the driver code and should not be used in drivers. Use pr_err instead of dev_err. Signed-off-by: Guenter Roeck --- drivers/watchdog/mena21_wdt.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/watchdog/mena21_wdt.c b/drivers/watchdog/mena21_wdt.c index 098fa9c34d6d..f0dc794d0fda 100644 --- a/drivers/watchdog/mena21_wdt.c +++ b/drivers/watchdog/mena21_wdt.c @@ -7,6 +7,9 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include @@ -100,13 +103,14 @@ static int a21_wdt_set_timeout(struct watchdog_device *wdt, struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt); if (timeout != 1 && timeout != 30) { - dev_err(wdt->dev, "Only 1 and 30 allowed as timeout\n"); + pr_err("watchdog%d: Only 1 and 30 allowed as timeout\n", + wdt->id); return -EINVAL; } if (timeout == 30 && wdt->timeout == 1) { - dev_err(wdt->dev, - "Transition from fast to slow mode not allowed\n"); + pr_err("watchdog%d: Transition from fast to slow mode not allowed\n", + wdt->id); return -EINVAL; } -- 2.1.4 -- 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/