Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932543AbcJ3UjG (ORCPT ); Sun, 30 Oct 2016 16:39:06 -0400 Received: from mail1.windriver.com ([147.11.146.13]:62543 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757373AbcJ3UjA (ORCPT ); Sun, 30 Oct 2016 16:39:00 -0400 From: Paul Gortmaker To: CC: Paul Gortmaker , Martin Schwidefsky , Heiko Carstens , Subject: [PATCH 8/9] s390: kernel: make lgr explicitly non-modular Date: Sun, 30 Oct 2016 16:37:31 -0400 Message-ID: <20161030203732.26405-9-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: 1309 Lines: 42 The Makefile currently controlling compilation of this code is obj-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 replace module.h with init.h and export.h since the file does export some symbols. Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: linux-s390@vger.kernel.org Signed-off-by: Paul Gortmaker --- arch/s390/kernel/lgr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/s390/kernel/lgr.c b/arch/s390/kernel/lgr.c index 6ea6d69339b5..ae7dff110054 100644 --- a/arch/s390/kernel/lgr.c +++ b/arch/s390/kernel/lgr.c @@ -5,7 +5,8 @@ * Author(s): Michael Holzheu */ -#include +#include +#include #include #include #include @@ -183,4 +184,4 @@ static int __init lgr_init(void) lgr_timer_set(); return 0; } -module_init(lgr_init); +device_initcall(lgr_init); -- 2.10.1