| Message ID | 0c11c0770fc4ec7e80a4b2e0ffce1055b792cfdb.1647854880.git.fthain@linux-m68k.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 27f9690a81d7acf185b78be8d03d4b3a243116b1 |
| Headers | show |
| Series | [v2] macintosh/via-pmu: Avoid compiler warnings when CONFIG_PROC_FS is disabled | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 24 jobs. |
| snowpatch_ozlabs/github-powerpc_clang | success | Successfully ran 7 jobs. |
| snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
On 3/21/22 02:28, Finn Thain wrote: > drivers/macintosh/via-pmu.c:897:12: warning: 'pmu_battery_proc_show' defined but not used [-Wunused-function] > static int pmu_battery_proc_show(struct seq_file *m, void *v) > ^~~~~~~~~~~~~~~~~~~~~ > drivers/macintosh/via-pmu.c:871:12: warning: 'pmu_irqstats_proc_show' defined but not used [-Wunused-function] > static int pmu_irqstats_proc_show(struct seq_file *m, void *v) > ^~~~~~~~~~~~~~~~~~~~~~ > drivers/macintosh/via-pmu.c:860:12: warning: 'pmu_info_proc_show' defined but not used [-Wunused-function] > static int pmu_info_proc_show(struct seq_file *m, void *v) > ^~~~~~~~~~~~~~~~~~ > > Add some #ifdefs to avoid unused code warnings when CONFIG_PROC_FS is > disabled. > > Cc: Randy Dunlap <rdunlap@infradead.org> > Cc: Christophe Leroy <christophe.leroy@csgroup.eu> > Reported-by: Randy Dunlap <rdunlap@infradead.org> > Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu> > Signed-off-by: Finn Thain <fthain@linux-m68k.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> Acked-by: Randy Dunlap <rdunlap@infradead.org> Thanks. > --- > Changed since v1: > - Simplified to take advantage of the fact that proc_mkdir() is stubbed > out when CONFIG_PROC_FS=n. Hence that call doesn't need to move > within the #ifdef. > --- > drivers/macintosh/via-pmu.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c > index 2109129ea1bb..495fd35b11de 100644 > --- a/drivers/macintosh/via-pmu.c > +++ b/drivers/macintosh/via-pmu.c > @@ -204,9 +204,11 @@ static int init_pmu(void); > static void pmu_start(void); > static irqreturn_t via_pmu_interrupt(int irq, void *arg); > static irqreturn_t gpio1_interrupt(int irq, void *arg); > +#ifdef CONFIG_PROC_FS > static int pmu_info_proc_show(struct seq_file *m, void *v); > static int pmu_irqstats_proc_show(struct seq_file *m, void *v); > static int pmu_battery_proc_show(struct seq_file *m, void *v); > +#endif > static void pmu_pass_intr(unsigned char *data, int len); > static const struct proc_ops pmu_options_proc_ops; > > @@ -857,6 +859,7 @@ query_battery_state(void) > 2, PMU_SMART_BATTERY_STATE, pmu_cur_battery+1); > } > > +#ifdef CONFIG_PROC_FS > static int pmu_info_proc_show(struct seq_file *m, void *v) > { > seq_printf(m, "PMU driver version : %d\n", PMU_DRIVER_VERSION); > @@ -977,6 +980,7 @@ static const struct proc_ops pmu_options_proc_ops = { > .proc_release = single_release, > .proc_write = pmu_options_proc_write, > }; > +#endif > > #ifdef CONFIG_ADB > /* Send an ADB command */
On Mon, 21 Mar 2022 20:28:00 +1100, Finn Thain wrote: > drivers/macintosh/via-pmu.c:897:12: warning: 'pmu_battery_proc_show' defined but not used [-Wunused-function] > static int pmu_battery_proc_show(struct seq_file *m, void *v) > ^~~~~~~~~~~~~~~~~~~~~ > drivers/macintosh/via-pmu.c:871:12: warning: 'pmu_irqstats_proc_show' defined but not used [-Wunused-function] > static int pmu_irqstats_proc_show(struct seq_file *m, void *v) > ^~~~~~~~~~~~~~~~~~~~~~ > drivers/macintosh/via-pmu.c:860:12: warning: 'pmu_info_proc_show' defined but not used [-Wunused-function] > static int pmu_info_proc_show(struct seq_file *m, void *v) > ^~~~~~~~~~~~~~~~~~ > > [...] Applied to powerpc/next. [1/1] macintosh/via-pmu: Avoid compiler warnings when CONFIG_PROC_FS is disabled https://git.kernel.org/powerpc/c/27f9690a81d7acf185b78be8d03d4b3a243116b1 cheers
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 2109129ea1bb..495fd35b11de 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -204,9 +204,11 @@ static int init_pmu(void); static void pmu_start(void); static irqreturn_t via_pmu_interrupt(int irq, void *arg); static irqreturn_t gpio1_interrupt(int irq, void *arg); +#ifdef CONFIG_PROC_FS static int pmu_info_proc_show(struct seq_file *m, void *v); static int pmu_irqstats_proc_show(struct seq_file *m, void *v); static int pmu_battery_proc_show(struct seq_file *m, void *v); +#endif static void pmu_pass_intr(unsigned char *data, int len); static const struct proc_ops pmu_options_proc_ops; @@ -857,6 +859,7 @@ query_battery_state(void) 2, PMU_SMART_BATTERY_STATE, pmu_cur_battery+1); } +#ifdef CONFIG_PROC_FS static int pmu_info_proc_show(struct seq_file *m, void *v) { seq_printf(m, "PMU driver version : %d\n", PMU_DRIVER_VERSION); @@ -977,6 +980,7 @@ static const struct proc_ops pmu_options_proc_ops = { .proc_release = single_release, .proc_write = pmu_options_proc_write, }; +#endif #ifdef CONFIG_ADB /* Send an ADB command */
drivers/macintosh/via-pmu.c:897:12: warning: 'pmu_battery_proc_show' defined but not used [-Wunused-function] static int pmu_battery_proc_show(struct seq_file *m, void *v) ^~~~~~~~~~~~~~~~~~~~~ drivers/macintosh/via-pmu.c:871:12: warning: 'pmu_irqstats_proc_show' defined but not used [-Wunused-function] static int pmu_irqstats_proc_show(struct seq_file *m, void *v) ^~~~~~~~~~~~~~~~~~~~~~ drivers/macintosh/via-pmu.c:860:12: warning: 'pmu_info_proc_show' defined but not used [-Wunused-function] static int pmu_info_proc_show(struct seq_file *m, void *v) ^~~~~~~~~~~~~~~~~~ Add some #ifdefs to avoid unused code warnings when CONFIG_PROC_FS is disabled. Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Christophe Leroy <christophe.leroy@csgroup.eu> Reported-by: Randy Dunlap <rdunlap@infradead.org> Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Finn Thain <fthain@linux-m68k.org> --- Changed since v1: - Simplified to take advantage of the fact that proc_mkdir() is stubbed out when CONFIG_PROC_FS=n. Hence that call doesn't need to move within the #ifdef. --- drivers/macintosh/via-pmu.c | 4 ++++ 1 file changed, 4 insertions(+)