From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752560AbbLMUGm (ORCPT ); Sun, 13 Dec 2015 15:06:42 -0500 Received: from mail1.windriver.com ([147.11.146.13]:39022 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752077AbbLMUGk (ORCPT ); Sun, 13 Dec 2015 15:06:40 -0500 From: Paul Gortmaker To: CC: Paul Gortmaker , Jens Axboe Subject: [PATCH 3/3] block: make noop-iosched.c explicitly non-modular Date: Sun, 13 Dec 2015 15:04:04 -0500 Message-ID: <1450037044-27628-4-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1450037044-27628-1-git-send-email-paul.gortmaker@windriver.com> References: <1450037044-27628-1-git-send-email-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 The Kconfig currently controlling compilation of this code is: config IOSCHED_NOOP bool default y ...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_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. We also delete the MODULE_LICENSE tag etc. since all that information is now contained at the top of the file in the comments. Cc: Jens Axboe Signed-off-by: Paul Gortmaker --- block/noop-iosched.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/block/noop-iosched.c b/block/noop-iosched.c index a163c487cf38..09f089ee7668 100644 --- a/block/noop-iosched.c +++ b/block/noop-iosched.c @@ -1,10 +1,11 @@ /* - * elevator noop + * elevator noop: No-op IO scheduler + * Author: Jens Axboe + * License: GPL */ #include #include #include -#include #include #include @@ -109,16 +110,4 @@ static int __init noop_init(void) { return elv_register(&elevator_noop); } - -static void __exit noop_exit(void) -{ - elv_unregister(&elevator_noop); -} - -module_init(noop_init); -module_exit(noop_exit); - - -MODULE_AUTHOR("Jens Axboe"); -MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("No-op IO scheduler"); +device_initcall(noop_init); -- 2.6.1