From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992624AbcB0UXh (ORCPT ); Sat, 27 Feb 2016 15:23:37 -0500 Received: from mail5.windriver.com ([192.103.53.11]:46795 "EHLO mail5.wrs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992460AbcB0UXg (ORCPT ); Sat, 27 Feb 2016 15:23:36 -0500 From: Paul Gortmaker To: CC: , Paul Gortmaker , Alexander Shishkin , Mathieu Poirier , Greg Kroah-Hartman Subject: [PATCH] drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular Date: Sat, 27 Feb 2016 15:21:47 -0500 Message-ID: <1456604507-4728-1-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 2.6.1 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 In commit 941943cf519f7cacbbcecee5c4ef4b77b466bd5c ("drivers/hwtracing: make coresight-* explicitly non-modular") we removed all uses of modular functions/macros in favour of their built-in equivlents in this subsystem. However that commit and commit 0bcbf2e30ff2271b54f54c8697a185f7d86ec6e4 ("coresight: etm-perf: new PMU driver for ETM tracers") were in flight at the same time, and hence one new non-modular user of module_init crept back in. Fix it up like we did all the others. Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit. Cc: Alexander Shishkin Cc: Mathieu Poirier Cc: Greg Kroah-Hartman Signed-off-by: Paul Gortmaker --- drivers/hwtracing/coresight/coresight-etm-perf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index 36153a77e982..755125f7917f 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -390,4 +390,4 @@ static int __init etm_perf_init(void) return ret; } -module_init(etm_perf_init); +device_initcall(etm_perf_init); -- 2.6.1