drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Sat, 27 Feb 2016 20:21:47 +0000 (15:21 -0500)
committerMathieu Poirier <mathieu.poirier@linaro.org>
Wed, 1 Jun 2016 21:31:29 +0000 (15:31 -0600)
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 <alexander.shishkin@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit ca48fa22c3ed3b7b062bc6fa7b72493c00571e33)

drivers/hwtracing/coresight/coresight-etm-perf.c

index 36153a77e9823c6d1d07a01b84a43694270b15fc..755125f7917f2cb6aa369fd88d28d763e688a9d6 100644 (file)
@@ -21,7 +21,7 @@
 #include <linux/device.h>
 #include <linux/list.h>
 #include <linux/mm.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/perf_event.h>
 #include <linux/slab.h>
 #include <linux/types.h>
@@ -390,4 +390,4 @@ static int __init etm_perf_init(void)
 
        return ret;
 }
-module_init(etm_perf_init);
+device_initcall(etm_perf_init);