diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-06-04 03:03:56 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 23:46:43 +0300 |
| commit | fc368ea1ea00c9418d6f2c25cd4c0869f1a16d5f (patch) | |
| tree | a03cabfed40decf6640b1c7202bcb24ab7da965a | |
| parent | 5a6a7cd05c039f3c4d8f5f52fddfb7cb2bbd6119 (diff) | |
| download | linux-fc368ea1ea00c9418d6f2c25cd4c0869f1a16d5f.tar.xz | |
drivers/hwtracing: fix coresight-etm4x implicit <module.h> usage
In commit 2e1cdfe184b5202d51e0611d7a051e2bea303946 ("coresight-etm4x:
Adding CoreSight ETM4x driver") this driver was added.
It uses module_amba_driver() to register itself with the system,
which is just an alias for module_driver. This currently works by
relying on getting that via init.h but we are planning to move that
code[1] to module.h -- at which time this will fail to compile since
it does not include module.h currently, resulting in:
drivers/hwtracing/coresight/coresight-etm4x.c:2701:1: note: in expansion of macro ‘module_amba_driver’
module_amba_driver(etm4x_driver);
^
include/linux/device.h:1296:1: error: type defaults to ‘int’ in declaration of ‘module_init’ [-Werror=implicit-int]
module_init(__driver##_init); \
^
In the future, the amba support may want to create another alias that
uses builtin_driver[2] for cases like this which are using bool Kconfig
triggers, but for now we just fix the implicit include.
[1] https://lkml.kernel.org/r/1433276168-21550-1-git-send-email-paul.gortmaker@windriver.com
[2] https://lkml.kernel.org/r/1431287385-1526-1-git-send-email-paul.gortmaker@windriver.com
Cc: Pratik Patel <pratikp@codeaurora.org>
Cc: Kaixu Xia <xiakaixu@huawei.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>
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-etm4x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index f0b50af4fc30..1312e993c501 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c @@ -15,6 +15,7 @@ #include <linux/init.h> #include <linux/types.h> #include <linux/device.h> +#include <linux/module.h> #include <linux/io.h> #include <linux/err.h> #include <linux/fs.h> |