| Message ID | 20180713070317.6724-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6ade689711eeedb7070944b0764024c936730c9f |
| Delegated to: | Kalle Valo |
| Headers | show |
+ Randy On 7/13/2018 9:03 AM, YueHaibing wrote: > When CONFIG_PROC_FS isn't set, gcc warning this: > > drivers/net/wireless/intersil/hostap/hostap_hw.c:2901:12: warning: ‘prism2_registers_proc_show’ defined but not used [-Wunused-function] > static int prism2_registers_proc_show(struct seq_file *m, void *v) > > drivers/net/wireless/intersil/hostap/hostap_proc.c:16:12: warning: ‘prism2_debug_proc_show’ defined but not used [-Wunused-function] > static int prism2_debug_proc_show(struct seq_file *m, void *v) > ^ > drivers/net/wireless/intersil/hostap/hostap_proc.c:49:12: warning: ‘prism2_stats_proc_show’ defined but not used [-Wunused-function] > static int prism2_stats_proc_show(struct seq_file *m, void *v) > ^ > drivers/net/wireless/intersil/hostap/hostap_proc.c:177:12: warning: ‘prism2_crypt_proc_show’ defined but not used [-Wunused-function] > static int prism2_crypt_proc_show(struct seq_file *m, void *v) > ^ > > fix this by adding #ifdef around them. > hfa384x_read_reg is only used by prism2_registers_proc_show,so move it > into #ifdef. There was already a fix for this posted by Randy Dunlap taking a different approach, ie. use __maybe_unused classifier. To be honest I prefer the ifdef approach as it is more explicit and does not feel like a cheat. Actually some of the functions are between a flag already PRISM2_NO_PROCFS_DEBUG which is in a private header file hostap_config.h. Seems like this would be better placed in Kconfig and depend on CONFIG_PROCFS. Anyway, this driver is old cruft. Maybe some people are still running it, but it is probably not worth the effort so fine with either fix. Regards, Arend
On 2018/7/13 15:26, Arend van Spriel wrote: > + Randy > > On 7/13/2018 9:03 AM, YueHaibing wrote: >> When CONFIG_PROC_FS isn't set, gcc warning this: >> >> drivers/net/wireless/intersil/hostap/hostap_hw.c:2901:12: warning: ‘prism2_registers_proc_show’ defined but not used [-Wunused-function] >> static int prism2_registers_proc_show(struct seq_file *m, void *v) >> >> drivers/net/wireless/intersil/hostap/hostap_proc.c:16:12: warning: ‘prism2_debug_proc_show’ defined but not used [-Wunused-function] >> static int prism2_debug_proc_show(struct seq_file *m, void *v) >> ^ >> drivers/net/wireless/intersil/hostap/hostap_proc.c:49:12: warning: ‘prism2_stats_proc_show’ defined but not used [-Wunused-function] >> static int prism2_stats_proc_show(struct seq_file *m, void *v) >> ^ >> drivers/net/wireless/intersil/hostap/hostap_proc.c:177:12: warning: ‘prism2_crypt_proc_show’ defined but not used [-Wunused-function] >> static int prism2_crypt_proc_show(struct seq_file *m, void *v) >> ^ >> >> fix this by adding #ifdef around them. >> hfa384x_read_reg is only used by prism2_registers_proc_show,so move it >> into #ifdef. > > There was already a fix for this posted by Randy Dunlap taking a different approach, ie. use __maybe_unused classifier. To be honest I prefer the ifdef approach as it is more explicit and does not feel like a cheat. > > Actually some of the functions are between a flag already PRISM2_NO_PROCFS_DEBUG which is in a private header file hostap_config.h. Seems like this would be better placed in Kconfig and depend on CONFIG_PROCFS. Anyway, this driver is old cruft. Maybe some people are still running it, but it is probably not worth the effort so fine with either fix. > I dont check Randy's patch. ignore this pls. > Regards, > Arend > > . >
On 07/13/2018 12:26 AM, Arend van Spriel wrote: > + Randy > > On 7/13/2018 9:03 AM, YueHaibing wrote: >> When CONFIG_PROC_FS isn't set, gcc warning this: >> >> drivers/net/wireless/intersil/hostap/hostap_hw.c:2901:12: warning: ‘prism2_registers_proc_show’ defined but not used [-Wunused-function] >> static int prism2_registers_proc_show(struct seq_file *m, void *v) >> >> drivers/net/wireless/intersil/hostap/hostap_proc.c:16:12: warning: ‘prism2_debug_proc_show’ defined but not used [-Wunused-function] >> static int prism2_debug_proc_show(struct seq_file *m, void *v) >> ^ >> drivers/net/wireless/intersil/hostap/hostap_proc.c:49:12: warning: ‘prism2_stats_proc_show’ defined but not used [-Wunused-function] >> static int prism2_stats_proc_show(struct seq_file *m, void *v) >> ^ >> drivers/net/wireless/intersil/hostap/hostap_proc.c:177:12: warning: ‘prism2_crypt_proc_show’ defined but not used [-Wunused-function] >> static int prism2_crypt_proc_show(struct seq_file *m, void *v) >> ^ >> >> fix this by adding #ifdef around them. >> hfa384x_read_reg is only used by prism2_registers_proc_show,so move it >> into #ifdef. > > There was already a fix for this posted by Randy Dunlap taking a different approach, ie. use __maybe_unused classifier. To be honest I prefer the ifdef approach as it is more explicit and does not feel like a cheat. Hi, You are welcome to merge (or ack or have someone else merge) either of them. I'm not counting patches, just trying to help out (in this case by reducing noise). > Actually some of the functions are between a flag already PRISM2_NO_PROCFS_DEBUG which is in a private header file hostap_config.h. Seems like this would be better placed in Kconfig and depend on CONFIG_PROCFS. Anyway, this driver is old cruft. Maybe some people are still running it, but it is probably not worth the effort so fine with either fix. > > Regards, > Arend
Arend van Spriel <arend.vanspriel@broadcom.com> writes: > + Randy > > On 7/13/2018 9:03 AM, YueHaibing wrote: >> When CONFIG_PROC_FS isn't set, gcc warning this: >> >> drivers/net/wireless/intersil/hostap/hostap_hw.c:2901:12: warning: ‘prism2_registers_proc_show’ defined but not used [-Wunused-function] >> static int prism2_registers_proc_show(struct seq_file *m, void *v) >> >> drivers/net/wireless/intersil/hostap/hostap_proc.c:16:12: warning: ‘prism2_debug_proc_show’ defined but not used [-Wunused-function] >> static int prism2_debug_proc_show(struct seq_file *m, void *v) >> ^ >> drivers/net/wireless/intersil/hostap/hostap_proc.c:49:12: warning: ‘prism2_stats_proc_show’ defined but not used [-Wunused-function] >> static int prism2_stats_proc_show(struct seq_file *m, void *v) >> ^ >> drivers/net/wireless/intersil/hostap/hostap_proc.c:177:12: warning: ‘prism2_crypt_proc_show’ defined but not used [-Wunused-function] >> static int prism2_crypt_proc_show(struct seq_file *m, void *v) >> ^ >> >> fix this by adding #ifdef around them. >> hfa384x_read_reg is only used by prism2_registers_proc_show,so move it >> into #ifdef. > > There was already a fix for this posted by Randy Dunlap taking a > different approach, ie. use __maybe_unused classifier. To be honest I > prefer the ifdef approach as it is more explicit and does not feel > like a cheat. I also prefer the ifdef approach more so I'm planning to take this patch.
On 2018/7/27 17:25, Kalle Valo wrote: > Arend van Spriel <arend.vanspriel@broadcom.com> writes: > >> + Randy >> >> On 7/13/2018 9:03 AM, YueHaibing wrote: >>> When CONFIG_PROC_FS isn't set, gcc warning this: >>> >>> drivers/net/wireless/intersil/hostap/hostap_hw.c:2901:12: warning: ‘prism2_registers_proc_show’ defined but not used [-Wunused-function] >>> static int prism2_registers_proc_show(struct seq_file *m, void *v) >>> >>> drivers/net/wireless/intersil/hostap/hostap_proc.c:16:12: warning: ‘prism2_debug_proc_show’ defined but not used [-Wunused-function] >>> static int prism2_debug_proc_show(struct seq_file *m, void *v) >>> ^ >>> drivers/net/wireless/intersil/hostap/hostap_proc.c:49:12: warning: ‘prism2_stats_proc_show’ defined but not used [-Wunused-function] >>> static int prism2_stats_proc_show(struct seq_file *m, void *v) >>> ^ >>> drivers/net/wireless/intersil/hostap/hostap_proc.c:177:12: warning: ‘prism2_crypt_proc_show’ defined but not used [-Wunused-function] >>> static int prism2_crypt_proc_show(struct seq_file *m, void *v) >>> ^ >>> >>> fix this by adding #ifdef around them. >>> hfa384x_read_reg is only used by prism2_registers_proc_show,so move it >>> into #ifdef. >> >> There was already a fix for this posted by Randy Dunlap taking a >> different approach, ie. use __maybe_unused classifier. To be honest I >> prefer the ifdef approach as it is more explicit and does not feel >> like a cheat. > > I also prefer the ifdef approach more so I'm planning to take this > patch. It's ok if you prefer pick this. >
On 07/27/2018 03:03 AM, YueHaibing wrote: > On 2018/7/27 17:25, Kalle Valo wrote: >> Arend van Spriel <arend.vanspriel@broadcom.com> writes: >> >>> + Randy >>> >>> On 7/13/2018 9:03 AM, YueHaibing wrote: >>>> When CONFIG_PROC_FS isn't set, gcc warning this: >>>> >>>> drivers/net/wireless/intersil/hostap/hostap_hw.c:2901:12: warning: ‘prism2_registers_proc_show’ defined but not used [-Wunused-function] >>>> static int prism2_registers_proc_show(struct seq_file *m, void *v) >>>> >>>> drivers/net/wireless/intersil/hostap/hostap_proc.c:16:12: warning: ‘prism2_debug_proc_show’ defined but not used [-Wunused-function] >>>> static int prism2_debug_proc_show(struct seq_file *m, void *v) >>>> ^ >>>> drivers/net/wireless/intersil/hostap/hostap_proc.c:49:12: warning: ‘prism2_stats_proc_show’ defined but not used [-Wunused-function] >>>> static int prism2_stats_proc_show(struct seq_file *m, void *v) >>>> ^ >>>> drivers/net/wireless/intersil/hostap/hostap_proc.c:177:12: warning: ‘prism2_crypt_proc_show’ defined but not used [-Wunused-function] >>>> static int prism2_crypt_proc_show(struct seq_file *m, void *v) >>>> ^ >>>> >>>> fix this by adding #ifdef around them. >>>> hfa384x_read_reg is only used by prism2_registers_proc_show,so move it >>>> into #ifdef. >>> >>> There was already a fix for this posted by Randy Dunlap taking a >>> different approach, ie. use __maybe_unused classifier. To be honest I >>> prefer the ifdef approach as it is more explicit and does not feel >>> like a cheat. >> >> I also prefer the ifdef approach more so I'm planning to take this >> patch. > > It's ok if you prefer pick this. Right.
YueHaibing <yuehaibing@huawei.com> wrote: > When CONFIG_PROC_FS isn't set, gcc warning this: > > drivers/net/wireless/intersil/hostap/hostap_hw.c:2901:12: warning: ‘prism2_registers_proc_show’ defined but not used [-Wunused-function] > static int prism2_registers_proc_show(struct seq_file *m, void *v) > > drivers/net/wireless/intersil/hostap/hostap_proc.c:16:12: warning: ‘prism2_debug_proc_show’ defined but not used [-Wunused-function] > static int prism2_debug_proc_show(struct seq_file *m, void *v) > ^ > drivers/net/wireless/intersil/hostap/hostap_proc.c:49:12: warning: ‘prism2_stats_proc_show’ defined but not used [-Wunused-function] > static int prism2_stats_proc_show(struct seq_file *m, void *v) > ^ > drivers/net/wireless/intersil/hostap/hostap_proc.c:177:12: warning: ‘prism2_crypt_proc_show’ defined but not used [-Wunused-function] > static int prism2_crypt_proc_show(struct seq_file *m, void *v) > ^ > > fix this by adding #ifdef around them. > hfa384x_read_reg is only used by prism2_registers_proc_show,so move it > into #ifdef. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Patch applied to wireless-drivers-next.git, thanks. 6ade689711ee hostap: hide unused procfs helpers
diff --git a/drivers/net/wireless/intersil/hostap/hostap_ap.c b/drivers/net/wireless/intersil/hostap/hostap_ap.c index d1884b8..0094b1d 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_ap.c +++ b/drivers/net/wireless/intersil/hostap/hostap_ap.c @@ -66,7 +66,7 @@ static void prism2_send_mgmt(struct net_device *dev, #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ -#ifndef PRISM2_NO_PROCFS_DEBUG +#if !defined(PRISM2_NO_PROCFS_DEBUG) && defined(CONFIG_PROC_FS) static int ap_debug_proc_show(struct seq_file *m, void *v) { struct ap_data *ap = PDE_DATA(file_inode(m->file)); @@ -81,8 +81,7 @@ static int ap_debug_proc_show(struct seq_file *m, void *v) seq_printf(m, "tx_drop_nonassoc=%u\n", ap->tx_drop_nonassoc); return 0; } -#endif /* PRISM2_NO_PROCFS_DEBUG */ - +#endif static void ap_sta_hash_add(struct ap_data *ap, struct sta_info *sta) { @@ -990,7 +989,7 @@ static void prism2_send_mgmt(struct net_device *dev, } #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ - +#ifdef CONFIG_PROC_FS static int prism2_sta_proc_show(struct seq_file *m, void *v) { struct sta_info *sta = m->private; @@ -1059,6 +1058,7 @@ static int prism2_sta_proc_show(struct seq_file *m, void *v) return 0; } +#endif static void handle_add_proc_queue(struct work_struct *work) { diff --git a/drivers/net/wireless/intersil/hostap/hostap_hw.c b/drivers/net/wireless/intersil/hostap/hostap_hw.c index 2720aa3..ad1aa65 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_hw.c +++ b/drivers/net/wireless/intersil/hostap/hostap_hw.c @@ -151,13 +151,6 @@ static int prism2_get_ram_size(local_info_t *local); #define HFA384X_MAGIC 0x8A32 #endif - -static u16 hfa384x_read_reg(struct net_device *dev, u16 reg) -{ - return HFA384X_INW(reg); -} - - static void hfa384x_read_regs(struct net_device *dev, struct hfa384x_regs *regs) { @@ -2897,7 +2890,12 @@ static void hostap_tick_timer(struct timer_list *t) } -#ifndef PRISM2_NO_PROCFS_DEBUG +#if !defined(PRISM2_NO_PROCFS_DEBUG) && defined(CONFIG_PROC_FS) +static u16 hfa384x_read_reg(struct net_device *dev, u16 reg) +{ + return HFA384X_INW(reg); +} + static int prism2_registers_proc_show(struct seq_file *m, void *v) { local_info_t *local = m->private; @@ -2951,8 +2949,7 @@ static int prism2_registers_proc_show(struct seq_file *m, void *v) return 0; } -#endif /* PRISM2_NO_PROCFS_DEBUG */ - +#endif struct set_tim_data { struct list_head list; diff --git a/drivers/net/wireless/intersil/hostap/hostap_proc.c b/drivers/net/wireless/intersil/hostap/hostap_proc.c index 5b33cca..703d74c 100644 --- a/drivers/net/wireless/intersil/hostap/hostap_proc.c +++ b/drivers/net/wireless/intersil/hostap/hostap_proc.c @@ -11,8 +11,7 @@ #define PROC_LIMIT (PAGE_SIZE - 80) - -#ifndef PRISM2_NO_PROCFS_DEBUG +#if !defined(PRISM2_NO_PROCFS_DEBUG) && defined(CONFIG_PROC_FS) static int prism2_debug_proc_show(struct seq_file *m, void *v) { local_info_t *local = m->private; @@ -43,9 +42,9 @@ static int prism2_debug_proc_show(struct seq_file *m, void *v) return 0; } -#endif /* PRISM2_NO_PROCFS_DEBUG */ - +#endif +#ifdef CONFIG_PROC_FS static int prism2_stats_proc_show(struct seq_file *m, void *v) { local_info_t *local = m->private; @@ -82,6 +81,7 @@ static int prism2_stats_proc_show(struct seq_file *m, void *v) return 0; } +#endif static int prism2_wds_proc_show(struct seq_file *m, void *v) { @@ -174,6 +174,7 @@ static const struct seq_operations prism2_bss_list_proc_seqops = { .show = prism2_bss_list_proc_show, }; +#ifdef CONFIG_PROC_FS static int prism2_crypt_proc_show(struct seq_file *m, void *v) { local_info_t *local = m->private; @@ -190,6 +191,7 @@ static int prism2_crypt_proc_show(struct seq_file *m, void *v) } return 0; } +#endif static ssize_t prism2_pda_proc_read(struct file *file, char __user *buf, size_t count, loff_t *_pos)
When CONFIG_PROC_FS isn't set, gcc warning this: drivers/net/wireless/intersil/hostap/hostap_hw.c:2901:12: warning: ‘prism2_registers_proc_show’ defined but not used [-Wunused-function] static int prism2_registers_proc_show(struct seq_file *m, void *v) drivers/net/wireless/intersil/hostap/hostap_proc.c:16:12: warning: ‘prism2_debug_proc_show’ defined but not used [-Wunused-function] static int prism2_debug_proc_show(struct seq_file *m, void *v) ^ drivers/net/wireless/intersil/hostap/hostap_proc.c:49:12: warning: ‘prism2_stats_proc_show’ defined but not used [-Wunused-function] static int prism2_stats_proc_show(struct seq_file *m, void *v) ^ drivers/net/wireless/intersil/hostap/hostap_proc.c:177:12: warning: ‘prism2_crypt_proc_show’ defined but not used [-Wunused-function] static int prism2_crypt_proc_show(struct seq_file *m, void *v) ^ fix this by adding #ifdef around them. hfa384x_read_reg is only used by prism2_registers_proc_show,so move it into #ifdef. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/net/wireless/intersil/hostap/hostap_ap.c | 8 ++++---- drivers/net/wireless/intersil/hostap/hostap_hw.c | 17 +++++++---------- drivers/net/wireless/intersil/hostap/hostap_proc.c | 10 ++++++---- 3 files changed, 17 insertions(+), 18 deletions(-)