| Message ID | 20180713064658.10340-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8b8f3278d241658a7dcb95cefc9793ac85a43c3a |
| Delegated to: | Kalle Valo |
| Headers | show |
pls ignore this,my bad. On 2018/7/13 14:46, YueHaibing wrote: > When CONFIG_PROC_FS isn't set, gcc warning this: > > drivers/net/wireless/atmel/atmel.c:1402:12: warning: ‘atmel_proc_show’ defined but not used [-Wunused-function] > static int atmel_proc_show(struct seq_file *m, void *v) > ^ > fix this by adding #ifdef around it. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > drivers/net/wireless/atmel/atmel.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c > index b01dc34..3940876 100644 > --- a/drivers/net/wireless/atmel/atmel.c > +++ b/drivers/net/wireless/atmel/atmel.c > @@ -1399,6 +1399,7 @@ static int atmel_validate_channel(struct atmel_private *priv, int channel) > return 0; > } > > +#ifdef CONFIG_PROC_FS > static int atmel_proc_show(struct seq_file *m, void *v) > { > struct atmel_private *priv = m->private; > @@ -1481,6 +1482,7 @@ static int atmel_proc_show(struct seq_file *m, void *v) > seq_printf(m, "Current state:\t\t%s\n", s); > return 0; > } > +#endif > > static const struct net_device_ops atmel_netdev_ops = { > .ndo_open = atmel_open, >
(fixing top posting) YueHaibing <yuehaibing@huawei.com> writes: > On 2018/7/13 14:46, YueHaibing wrote: >> When CONFIG_PROC_FS isn't set, gcc warning this: >> >> drivers/net/wireless/atmel/atmel.c:1402:12: warning: ‘atmel_proc_show’ defined but not used [-Wunused-function] >> static int atmel_proc_show(struct seq_file *m, void *v) >> ^ >> fix this by adding #ifdef around it. >> >> Signed-off-by: YueHaibing <yuehaibing@huawei.com> > > pls ignore this,my bad. Why should I drop this? Does the patch have something wrong which I'm missing? I'm asking because I prefer this over Randy's version: https://patchwork.kernel.org/patch/10512913/
On 2018/7/27 17:24, Kalle Valo wrote: > (fixing top posting) > > YueHaibing <yuehaibing@huawei.com> writes: > >> On 2018/7/13 14:46, YueHaibing wrote: >>> When CONFIG_PROC_FS isn't set, gcc warning this: >>> >>> drivers/net/wireless/atmel/atmel.c:1402:12: warning: ‘atmel_proc_show’ defined but not used [-Wunused-function] >>> static int atmel_proc_show(struct seq_file *m, void *v) >>> ^ >>> fix this by adding #ifdef around it. >>> >>> Signed-off-by: YueHaibing <yuehaibing@huawei.com> >> >> pls ignore this,my bad. > > Why should I drop this? Does the patch have something wrong which I'm > missing? No,the patch is ok,just because I find this issue has a fix patch from Randy. > > I'm asking because I prefer this over Randy's version: > > https://patchwork.kernel.org/patch/10512913/ >
On 07/27/2018 02:24 AM, Kalle Valo wrote: > (fixing top posting) > > YueHaibing <yuehaibing@huawei.com> writes: > >> On 2018/7/13 14:46, YueHaibing wrote: >>> When CONFIG_PROC_FS isn't set, gcc warning this: >>> >>> drivers/net/wireless/atmel/atmel.c:1402:12: warning: ‘atmel_proc_show’ defined but not used [-Wunused-function] >>> static int atmel_proc_show(struct seq_file *m, void *v) >>> ^ >>> fix this by adding #ifdef around it. >>> >>> Signed-off-by: YueHaibing <yuehaibing@huawei.com> >> >> pls ignore this,my bad. > > Why should I drop this? Does the patch have something wrong which I'm > missing? > > I'm asking because I prefer this over Randy's version: > > https://patchwork.kernel.org/patch/10512913/ Take it. I don't mind.
YueHaibing <yuehaibing@huawei.com> wrote: > When CONFIG_PROC_FS isn't set, gcc warning this: > > drivers/net/wireless/atmel/atmel.c:1402:12: warning: ‘atmel_proc_show’ defined but not used [-Wunused-function] > static int atmel_proc_show(struct seq_file *m, void *v) > ^ > fix this by adding #ifdef around it. > > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Patch applied to wireless-drivers-next.git, thanks. 8b8f3278d241 atmel: hide unused procfs helpers
diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c index b01dc34..3940876 100644 --- a/drivers/net/wireless/atmel/atmel.c +++ b/drivers/net/wireless/atmel/atmel.c @@ -1399,6 +1399,7 @@ static int atmel_validate_channel(struct atmel_private *priv, int channel) return 0; } +#ifdef CONFIG_PROC_FS static int atmel_proc_show(struct seq_file *m, void *v) { struct atmel_private *priv = m->private; @@ -1481,6 +1482,7 @@ static int atmel_proc_show(struct seq_file *m, void *v) seq_printf(m, "Current state:\t\t%s\n", s); return 0; } +#endif static const struct net_device_ops atmel_netdev_ops = { .ndo_open = atmel_open,
When CONFIG_PROC_FS isn't set, gcc warning this: drivers/net/wireless/atmel/atmel.c:1402:12: warning: ‘atmel_proc_show’ defined but not used [-Wunused-function] static int atmel_proc_show(struct seq_file *m, void *v) ^ fix this by adding #ifdef around it. Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/net/wireless/atmel/atmel.c | 2 ++ 1 file changed, 2 insertions(+)