| Message ID | 20210907131046.117800-1-arnd@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | ne2000: fix unused function warning | expand |
Hi Arnd, Thanks for your patch! On Tue, Sep 7, 2021 at 3:10 PM Arnd Bergmann <arnd@kernel.org> wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Geert noticed a warning on MIPS TX49xx: > > drivers/net/ethernet/8390/ne.c:909:20: warning: ‘ne_add_devices’ defined but not used [-Wunused-function] And on Atari. > > Move the function into the #ifdef section that contains its > only caller. What about the second caller inside #ifdef MODULE? > Fixes: 4228c3942821 ("make legacy ISA probe optional") > Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- a/drivers/net/ethernet/8390/ne.c > +++ b/drivers/net/ethernet/8390/ne.c > @@ -906,22 +906,6 @@ static struct platform_driver ne_driver = { > }, > }; > > -static void __init ne_add_devices(void) > -{ > - int this_dev; > - struct platform_device *pdev; > - > - for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) { > - if (pdev_ne[this_dev]) > - continue; > - pdev = platform_device_register_simple( > - DRV_NAME, this_dev, NULL, 0); > - if (IS_ERR(pdev)) > - continue; > - pdev_ne[this_dev] = pdev; > - } > -} > - > #ifdef MODULE > static int __init ne_init(void) > { > @@ -953,6 +937,22 @@ static int __init ne_init(void) > module_init(ne_init); > > #ifdef CONFIG_NETDEV_LEGACY_INIT > +static void __init ne_add_devices(void) > +{ > + int this_dev; > + struct platform_device *pdev; > + > + for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) { > + if (pdev_ne[this_dev]) > + continue; > + pdev = platform_device_register_simple( > + DRV_NAME, this_dev, NULL, 0); > + if (IS_ERR(pdev)) > + continue; > + pdev_ne[this_dev] = pdev; > + } > +} > + > struct net_device * __init ne_probe(int unit) > { > int this_dev; > -- > 2.29.2 > -- Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Tue, Sep 7, 2021 at 3:19 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > > Move the function into the #ifdef section that contains its > > only caller. > > What about the second caller inside #ifdef MODULE? Indeed, please disregard this patch, I'll send a v2. Arnd
diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c index 53660bc8d6ff..1f7525f55994 100644 --- a/drivers/net/ethernet/8390/ne.c +++ b/drivers/net/ethernet/8390/ne.c @@ -906,22 +906,6 @@ static struct platform_driver ne_driver = { }, }; -static void __init ne_add_devices(void) -{ - int this_dev; - struct platform_device *pdev; - - for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) { - if (pdev_ne[this_dev]) - continue; - pdev = platform_device_register_simple( - DRV_NAME, this_dev, NULL, 0); - if (IS_ERR(pdev)) - continue; - pdev_ne[this_dev] = pdev; - } -} - #ifdef MODULE static int __init ne_init(void) { @@ -953,6 +937,22 @@ static int __init ne_init(void) module_init(ne_init); #ifdef CONFIG_NETDEV_LEGACY_INIT +static void __init ne_add_devices(void) +{ + int this_dev; + struct platform_device *pdev; + + for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) { + if (pdev_ne[this_dev]) + continue; + pdev = platform_device_register_simple( + DRV_NAME, this_dev, NULL, 0); + if (IS_ERR(pdev)) + continue; + pdev_ne[this_dev] = pdev; + } +} + struct net_device * __init ne_probe(int unit) { int this_dev;