Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757415AbcJ3UjA (ORCPT ); Sun, 30 Oct 2016 16:39:00 -0400 Received: from mail.windriver.com ([147.11.1.11]:57372 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757373AbcJ3Ui4 (ORCPT ); Sun, 30 Oct 2016 16:38:56 -0400 From: Paul Gortmaker To: CC: Paul Gortmaker , Martin Schwidefsky , Heiko Carstens , Peter Oberparleiter , Subject: [PATCH 4/9] s390: char: make sclp_tty explicitly non-modular Date: Sun, 30 Oct 2016 16:37:27 -0400 Message-ID: <20161030203732.26405-5-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161030203732.26405-1-paul.gortmaker@windriver.com> References: <20161030203732.26405-1-paul.gortmaker@windriver.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1404 Lines: 44 The Kconfig currently controlling compilation of this code is: drivers/s390/char/Kconfig:config SCLP_TTY drivers/s390/char/Kconfig: def_bool y ...meaning that it currently is not being built as a module by anyone. Lets remove the couple traces of modular infrastructure use, so that when reading the driver there is no doubt it is builtin-only. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We don't replace module.h with init.h since the file already has that. Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Peter Oberparleiter Cc: linux-s390@vger.kernel.org Signed-off-by: Paul Gortmaker --- drivers/s390/char/sclp_tty.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c index 3c6e174e19b6..9259017a1295 100644 --- a/drivers/s390/char/sclp_tty.c +++ b/drivers/s390/char/sclp_tty.c @@ -7,7 +7,6 @@ * Martin Schwidefsky */ -#include #include #include #include @@ -573,4 +572,4 @@ sclp_tty_init(void) sclp_tty_driver = driver; return 0; } -module_init(sclp_tty_init); +device_initcall(sclp_tty_init); -- 2.10.1