* [PATCH -next] powerpc/eeh: fix compile warning with CONFIG_PROC_FS=n
@ 2020-09-05 11:17 ` Yang Yingliang
0 siblings, 0 replies; 4+ messages in thread
From: Yang Yingliang @ 2020-09-05 11:17 UTC (permalink / raw)
To: linuxppc-dev, linux-kernel; +Cc: ruscur, oohall, mpe, yangyingliang
Fix the compile warning:
arch/powerpc/kernel/eeh.c:1639:12: error: 'proc_eeh_show' defined but not used [-Werror=unused-function]
static int proc_eeh_show(struct seq_file *m, void *v)
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
arch/powerpc/kernel/eeh.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 94682382fc8c..420c3c25c6e7 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -1636,6 +1636,7 @@ int eeh_pe_inject_err(struct eeh_pe *pe, int type, int func,
}
EXPORT_SYMBOL_GPL(eeh_pe_inject_err);
+#ifdef CONFIG_PROC_FS
static int proc_eeh_show(struct seq_file *m, void *v)
{
if (!eeh_enabled()) {
@@ -1662,6 +1663,7 @@ static int proc_eeh_show(struct seq_file *m, void *v)
return 0;
}
+#endif
#ifdef CONFIG_DEBUG_FS
static int eeh_enable_dbgfs_set(void *data, u64 val)
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH -next] powerpc/eeh: fix compile warning with CONFIG_PROC_FS=n
@ 2020-09-05 11:17 ` Yang Yingliang
0 siblings, 0 replies; 4+ messages in thread
From: Yang Yingliang @ 2020-09-05 11:17 UTC (permalink / raw)
To: linuxppc-dev, linux-kernel; +Cc: yangyingliang, oohall
Fix the compile warning:
arch/powerpc/kernel/eeh.c:1639:12: error: 'proc_eeh_show' defined but not used [-Werror=unused-function]
static int proc_eeh_show(struct seq_file *m, void *v)
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
arch/powerpc/kernel/eeh.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index 94682382fc8c..420c3c25c6e7 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -1636,6 +1636,7 @@ int eeh_pe_inject_err(struct eeh_pe *pe, int type, int func,
}
EXPORT_SYMBOL_GPL(eeh_pe_inject_err);
+#ifdef CONFIG_PROC_FS
static int proc_eeh_show(struct seq_file *m, void *v)
{
if (!eeh_enabled()) {
@@ -1662,6 +1663,7 @@ static int proc_eeh_show(struct seq_file *m, void *v)
return 0;
}
+#endif
#ifdef CONFIG_DEBUG_FS
static int eeh_enable_dbgfs_set(void *data, u64 val)
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH -next] powerpc/eeh: fix compile warning with CONFIG_PROC_FS=n
2020-09-05 11:17 ` Yang Yingliang
@ 2020-09-06 7:01 ` Christophe Leroy
-1 siblings, 0 replies; 4+ messages in thread
From: Christophe Leroy @ 2020-09-06 7:01 UTC (permalink / raw)
To: Yang Yingliang, linuxppc-dev, linux-kernel, linux-fsdevel,
Alexey Dobriyan
Cc: oohall
Le 05/09/2020 à 13:17, Yang Yingliang a écrit :
> Fix the compile warning:
>
> arch/powerpc/kernel/eeh.c:1639:12: error: 'proc_eeh_show' defined but not used [-Werror=unused-function]
> static int proc_eeh_show(struct seq_file *m, void *v)
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
> arch/powerpc/kernel/eeh.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
> index 94682382fc8c..420c3c25c6e7 100644
> --- a/arch/powerpc/kernel/eeh.c
> +++ b/arch/powerpc/kernel/eeh.c
> @@ -1636,6 +1636,7 @@ int eeh_pe_inject_err(struct eeh_pe *pe, int type, int func,
> }
> EXPORT_SYMBOL_GPL(eeh_pe_inject_err);
>
> +#ifdef CONFIG_PROC_FS
I don't like this way of fixing the issue, because you'll get an
unbalanced source code: proc_eeh_show() is apparently referenced all the
time in eeh_init_proc(), but because proc_create_single() is a NULL
macro when CONFIG_PROC_FS is not selected, you get the 'unused function'
error.
I think the right fix should be to rewrite proc_create_single() as a
static inline function that calls proc_create_single_data() when
CONFIG_PROC_FS is selected and just returns NULL otherwise.
> static int proc_eeh_show(struct seq_file *m, void *v)
> {
> if (!eeh_enabled()) {
> @@ -1662,6 +1663,7 @@ static int proc_eeh_show(struct seq_file *m, void *v)
>
> return 0;
> }
> +#endif
>
> #ifdef CONFIG_DEBUG_FS
> static int eeh_enable_dbgfs_set(void *data, u64 val)
>
Christophe
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH -next] powerpc/eeh: fix compile warning with CONFIG_PROC_FS=n
@ 2020-09-06 7:01 ` Christophe Leroy
0 siblings, 0 replies; 4+ messages in thread
From: Christophe Leroy @ 2020-09-06 7:01 UTC (permalink / raw)
To: Yang Yingliang, linuxppc-dev, linux-kernel, linux-fsdevel,
Alexey Dobriyan
Cc: oohall
Le 05/09/2020 à 13:17, Yang Yingliang a écrit :
> Fix the compile warning:
>
> arch/powerpc/kernel/eeh.c:1639:12: error: 'proc_eeh_show' defined but not used [-Werror=unused-function]
> static int proc_eeh_show(struct seq_file *m, void *v)
>
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
> arch/powerpc/kernel/eeh.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
> index 94682382fc8c..420c3c25c6e7 100644
> --- a/arch/powerpc/kernel/eeh.c
> +++ b/arch/powerpc/kernel/eeh.c
> @@ -1636,6 +1636,7 @@ int eeh_pe_inject_err(struct eeh_pe *pe, int type, int func,
> }
> EXPORT_SYMBOL_GPL(eeh_pe_inject_err);
>
> +#ifdef CONFIG_PROC_FS
I don't like this way of fixing the issue, because you'll get an
unbalanced source code: proc_eeh_show() is apparently referenced all the
time in eeh_init_proc(), but because proc_create_single() is a NULL
macro when CONFIG_PROC_FS is not selected, you get the 'unused function'
error.
I think the right fix should be to rewrite proc_create_single() as a
static inline function that calls proc_create_single_data() when
CONFIG_PROC_FS is selected and just returns NULL otherwise.
> static int proc_eeh_show(struct seq_file *m, void *v)
> {
> if (!eeh_enabled()) {
> @@ -1662,6 +1663,7 @@ static int proc_eeh_show(struct seq_file *m, void *v)
>
> return 0;
> }
> +#endif
>
> #ifdef CONFIG_DEBUG_FS
> static int eeh_enable_dbgfs_set(void *data, u64 val)
>
Christophe
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-06 7:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-05 11:17 [PATCH -next] powerpc/eeh: fix compile warning with CONFIG_PROC_FS=n Yang Yingliang
2020-09-05 11:17 ` Yang Yingliang
2020-09-06 7:01 ` Christophe Leroy
2020-09-06 7:01 ` Christophe Leroy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.