From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB119C072A4 for ; Sat, 18 May 2019 21:28:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 825B82087B for ; Sat, 18 May 2019 21:28:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727600AbfERV2L (ORCPT ); Sat, 18 May 2019 17:28:11 -0400 Received: from sauhun.de ([88.99.104.3]:35780 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728435AbfERV2K (ORCPT ); Sat, 18 May 2019 17:28:10 -0400 Received: from localhost (p5486CE4C.dip0.t-ipconnect.de [84.134.206.76]) by pokefinder.org (Postfix) with ESMTPSA id 135652C059D; Sat, 18 May 2019 23:28:09 +0200 (CEST) From: Wolfram Sang To: linux-watchdog@vger.kernel.org Cc: Wolfram Sang , Wim Van Sebroeck , Guenter Roeck Subject: [PATCH 02/46] watchdog: let core print error message when registering device fails Date: Sat, 18 May 2019 23:27:17 +0200 Message-Id: <20190518212801.31010-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190518212801.31010-1-wsa+renesas@sang-engineering.com> References: <20190518212801.31010-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org So we can remove boilerplate code from drivers. Signed-off-by: Wolfram Sang --- drivers/watchdog/watchdog_core.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c index 9fd096af0cc5..cf3247224a6e 100644 --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -264,6 +264,7 @@ static int __watchdog_register_device(struct watchdog_device *wdd) int watchdog_register_device(struct watchdog_device *wdd) { + const char *dev_str; int ret = 0; mutex_lock(&wtd_deferred_reg_mutex); @@ -272,6 +273,14 @@ int watchdog_register_device(struct watchdog_device *wdd) else watchdog_deferred_registration_add(wdd); mutex_unlock(&wtd_deferred_reg_mutex); + + if (ret) { + dev_str = wdd->parent ? dev_name(wdd->parent) : + (const char *)wdd->info->identity; + pr_err("%s: failed to register watchdog device (err = %d)\n", + dev_str, ret); + } + return ret; } EXPORT_SYMBOL_GPL(watchdog_register_device); -- 2.19.1