Messages in this thread Patch in this message | | | Date | Mon, 21 Mar 2022 19:50:41 +1100 (AEDT) | From | Finn Thain <> | Subject | Re: [PATCH] macintosh/via-pmu: Fix compiler warnings when CONFIG_PROC_FS is disabled |
| |
Hi Christophe,
On Mon, 21 Mar 2022, Finn Thain wrote:
> On Mon, 21 Mar 2022, Christophe Leroy wrote: > > > Le 19/03/2022 à 08:20, Finn Thain a écrit : > > > 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) > > > ^~~~~~~~~~~~~~~~~~ > > > > > > Rearrange some code and add some #ifdefs to avoid unused code warnings > > > when CONFIG_PROC_FS is disabled. > > > > Why not just put those three functions inside an #ifdef CONFIG_PROC_FS ? > > > > You'd get a warning about the prototypes ("declared static but never > defined"). Rather than add an ifdef around the prototypes as well, I > just reordered things a little.
Oops, I was forgetting that I also added an ifdef around the new prototype.
The simplest solution is probably the patch below, as it better exploits the stubbed-out proc_* API in include/linux/proc_fs.h.
Was this what you had in mind?
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 */ | |