[PATCH staging] drivers/hwtracing: fix coresight-etm4x implicit <module.h> usage

[PATCH staging] drivers/hwtracing: fix coresight-etm4x implicit <module.h> usage

[Paul Gortmaker]

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>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[Note: Commit 2e1cdfe184b520 is only in linux-next trees via staging-next;
 this fixes a next build fail when staging-next is merged with [1] above.]

 drivers/hwtracing/coresight/coresight-etm4x.c | 1 +
 1 file changed, 1 insertion(+)

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>
-- 
2.2.1

Re: [PATCH staging] drivers/hwtracing: fix coresight-etm4x implicit <module.h> usage

[Mathieu Poirier]

On 3 June 2015 at 18:03, Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> 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>
> Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>
> [Note: Commit 2e1cdfe184b520 is only in linux-next trees via staging-next;
>  this fixes a next build fail when staging-next is merged with [1] above.]
>
>  drivers/hwtracing/coresight/coresight-etm4x.c | 1 +
>  1 file changed, 1 insertion(+)
>
> 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>
> --
> 2.2.1
>

Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org>