From patchwork Tue Apr 23 15:48:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 10913273 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D7C20161F for ; Tue, 23 Apr 2019 15:51:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C91B0288EE for ; Tue, 23 Apr 2019 15:51:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB4572894B; Tue, 23 Apr 2019 15:51:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36C3F288B3 for ; Tue, 23 Apr 2019 15:51:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727745AbfDWPv0 (ORCPT ); Tue, 23 Apr 2019 11:51:26 -0400 Received: from mail5.windriver.com ([192.103.53.11]:40460 "EHLO mail5.wrs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727467AbfDWPv0 (ORCPT ); Tue, 23 Apr 2019 11:51:26 -0400 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail5.wrs.com (8.15.2/8.15.2) with ESMTPS id x3NFmwNU005137 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Tue, 23 Apr 2019 08:50:06 -0700 Received: from yow-cube1.wrs.com (128.224.56.98) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.439.0; Tue, 23 Apr 2019 08:49:49 -0700 From: Paul Gortmaker To: Wim Van Sebroeck , Guenter Roeck CC: , Paul Gortmaker , Wim Van Sebroeck , Alan Cox Subject: [PATCH 2/5] watchdog: watchdog_core: make it explicitly non-modular Date: Tue, 23 Apr 2019 11:48:32 -0400 Message-ID: <1556034515-28792-3-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556034515-28792-1-git-send-email-paul.gortmaker@windriver.com> References: <1556034515-28792-1-git-send-email-paul.gortmaker@windriver.com> MIME-Version: 1.0 Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Kconfig currently controlling compilation of this code is: config WATCHDOG_CORE bool "WatchDog Timer Driver Core" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. We replace module.h with export.h since the file does export some symbols. We don't add init.h since the file already has that. We also delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. Cc: Wim Van Sebroeck Cc: Guenter Roeck Cc: Alan Cox Cc: linux-watchdog@vger.kernel.org Signed-off-by: Paul Gortmaker --- drivers/watchdog/watchdog_core.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c index eb8fa25f8eb2..f9f88f59d181 100644 --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -28,7 +28,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -#include /* For EXPORT_SYMBOL/module stuff/... */ +#include /* For EXPORT_SYMBOL stuff */ #include /* For standard types */ #include /* For the -ENODEV/... values */ #include /* For printk/panic/... */ @@ -359,17 +359,4 @@ static int __init watchdog_init(void) watchdog_deferred_registration(); return 0; } - -static void __exit watchdog_exit(void) -{ - watchdog_dev_exit(); - ida_destroy(&watchdog_ida); -} - subsys_initcall_sync(watchdog_init); -module_exit(watchdog_exit); - -MODULE_AUTHOR("Alan Cox "); -MODULE_AUTHOR("Wim Van Sebroeck "); -MODULE_DESCRIPTION("WatchDog Timer Driver Core"); -MODULE_LICENSE("GPL");