From patchwork Tue Sep 27 01:18:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Gortmaker X-Patchwork-Id: 9351409 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 41FF16086A for ; Tue, 27 Sep 2016 01:19:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3459728F27 for ; Tue, 27 Sep 2016 01:19:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 28B8328F2B; Tue, 27 Sep 2016 01:19:56 +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=-6.9 required=2.0 tests=BAYES_00,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 49D9828F28 for ; Tue, 27 Sep 2016 01:19:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756574AbcI0BTp (ORCPT ); Mon, 26 Sep 2016 21:19:45 -0400 Received: from mail1.windriver.com ([147.11.146.13]:35871 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756070AbcI0BTo (ORCPT ); Mon, 26 Sep 2016 21:19:44 -0400 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id u8R1JG0B006671 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Mon, 26 Sep 2016 18:19:17 -0700 (PDT) Received: from yow-lpgnfs-02.wrs.com (128.224.149.8) by ALA-HCA.corp.ad.wrs.com (147.11.189.40) with Microsoft SMTP Server id 14.3.294.0; Mon, 26 Sep 2016 18:19:15 -0700 From: Paul Gortmaker To: CC: Paul Gortmaker , Steffen Klassert , Thomas Gleixner , Sebastian Andrzej Siewior , Subject: [PATCH] padata: remove recently added module usage from bool code Date: Mon, 26 Sep 2016 21:18:21 -0400 Message-ID: <20160927011821.6635-1-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.10.0 MIME-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In commit 30e92153b4e6 ("padata: Convert to hotplug state machine") this file started using module.h and got module_init and module_exit added to it. However the Kconfig for it is: init/Kconfig:config PADATA init/Kconfig: depends on SMP init/Kconfig: bool ...and so 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. Cc: Steffen Klassert Cc: Thomas Gleixner Cc: Sebastian Andrzej Siewior Cc: linux-crypto@vger.kernel.org Signed-off-by: Paul Gortmaker Acked-by: Sebastian Andrzej Siewior --- kernel/padata.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/kernel/padata.c b/kernel/padata.c index 7848f0566403..355807e52b1e 100644 --- a/kernel/padata.c +++ b/kernel/padata.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #define MAX_OBJ_NUM 1000 @@ -1043,11 +1043,6 @@ static __init int padata_driver_init(void) hp_online = ret; return 0; } -module_init(padata_driver_init); +device_initcall(padata_driver_init); -static __exit void padata_driver_exit(void) -{ - cpuhp_remove_multi_state(hp_online); -} -module_exit(padata_driver_exit); #endif