From patchwork Tue Apr 23 15:48:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 10913275 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 0E5B8161F for ; Tue, 23 Apr 2019 15:51:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3CDD28968 for ; Tue, 23 Apr 2019 15:51:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E78D228972; Tue, 23 Apr 2019 15:51:57 +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 82F1F28969 for ; Tue, 23 Apr 2019 15:51:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728005AbfDWPv5 (ORCPT ); Tue, 23 Apr 2019 11:51:57 -0400 Received: from mail5.windriver.com ([192.103.53.11]:40468 "EHLO mail5.wrs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727467AbfDWPv4 (ORCPT ); Tue, 23 Apr 2019 11:51:56 -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 x3NFmwNX005137 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Tue, 23 Apr 2019 08:50:17 -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:50:13 -0700 From: Paul Gortmaker To: Wim Van Sebroeck , Guenter Roeck CC: , Paul Gortmaker , Avi Fishman , "Tomer Maimon" , Tali Perry , "Patrick Venture" , Nancy Yuen , Benjamin Fair , Subject: [PATCH 3/5] watchdog: npcm: make it explicitly non-modular Date: Tue, 23 Apr 2019 11:48:33 -0400 Message-ID: <1556034515-28792-4-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 NPCM7XX_WATCHDOG bool "Nuvoton NPCM750 watchdog" ...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. Since module_platform_driver() uses the same init level priority as builtin_platform_driver() the init ordering remains unchanged with this commit. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments. Cc: Avi Fishman Cc: Tomer Maimon Cc: Tali Perry Cc: Patrick Venture Cc: Nancy Yuen Cc: Benjamin Fair Cc: Wim Van Sebroeck Cc: Guenter Roeck Cc: openbmc@lists.ozlabs.org Cc: linux-watchdog@vger.kernel.org Signed-off-by: Paul Gortmaker --- drivers/watchdog/npcm_wdt.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/watchdog/npcm_wdt.c b/drivers/watchdog/npcm_wdt.c index 0d4213652ecc..44d305683ab6 100644 --- a/drivers/watchdog/npcm_wdt.c +++ b/drivers/watchdog/npcm_wdt.c @@ -2,11 +2,15 @@ // Copyright (c) 2018 Nuvoton Technology corporation. // Copyright (c) 2018 IBM Corp. +/* + * Watchdog driver for NPCM + * Author: Joel Stanley + */ + #include #include #include #include -#include #include #include #include @@ -237,7 +241,6 @@ static const struct of_device_id npcm_wdt_match[] = { {.compatible = "nuvoton,npcm750-wdt"}, {}, }; -MODULE_DEVICE_TABLE(of, npcm_wdt_match); #endif static struct platform_driver npcm_wdt_driver = { @@ -247,8 +250,4 @@ static struct platform_driver npcm_wdt_driver = { .of_match_table = of_match_ptr(npcm_wdt_match), }, }; -module_platform_driver(npcm_wdt_driver); - -MODULE_AUTHOR("Joel Stanley"); -MODULE_DESCRIPTION("Watchdog driver for NPCM"); -MODULE_LICENSE("GPL v2"); +builtin_platform_driver(npcm_wdt_driver);