| Message ID | 20180528155059.2736080-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 37c9102f216c2ecd4296de1027fbfc4fa7d73877 |
| Headers | show |
| Series | net: davinci: fix building davinci mdio code without CONFIG_OF | expand |
Hi Arnd, On Monday 28 May 2018 09:20 PM, Arnd Bergmann wrote: > Test-building this driver on targets without CONFIG_OF revealed a build > failure: > > drivers/net/ethernet/ti/davinci_mdio.c: In function 'davinci_mdio_probe': > drivers/net/ethernet/ti/davinci_mdio.c:380:9: error: implicit declaration of function 'davinci_mdio_probe_dt'; did you mean 'davinci_mdio_probe'? [-Werror=implicit-function-declaration] > > This adjusts the #ifdef logic in the driver to make it build in > all configurations. > > Fixes: 2652113ff043 ("net: ethernet: ti: Allow most drivers with COMPILE_TEST") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Your patch fixes the issue. Acked-by: Sekhar Nori <nsekhar@ti.com> One question below: > --- > drivers/net/ethernet/ti/davinci_mdio.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c > index 8ac72831af05..a98aedae1b41 100644 > --- a/drivers/net/ethernet/ti/davinci_mdio.c > +++ b/drivers/net/ethernet/ti/davinci_mdio.c > @@ -321,7 +321,6 @@ static int davinci_mdio_write(struct mii_bus *bus, int phy_id, > return ret; > } > > -#if IS_ENABLED(CONFIG_OF) > static int davinci_mdio_probe_dt(struct mdio_platform_data *data, > struct platform_device *pdev) > { > @@ -339,7 +338,6 @@ static int davinci_mdio_probe_dt(struct mdio_platform_data *data, > > return 0; > } > -#endif > > #if IS_ENABLED(CONFIG_OF) > static const struct davinci_mdio_of_param of_cpsw_mdio_data = { > @@ -374,7 +372,7 @@ static int davinci_mdio_probe(struct platform_device *pdev) > return -ENOMEM; > } > > - if (dev->of_node) { > + if (IS_ENABLED(CONFIG_OF) && dev->of_node) { > const struct of_device_id *of_id; > > ret = davinci_mdio_probe_dt(&data->pdata, pdev); I was expecting this one change to fix the issue since the if() block should be compiled away removing references to davinci_mdio_probe_dt(). The code does get compiled out and there are no references to davinci_mdio_probe_dt() in the final object when !CONFIG_OF. But the compile error remains if the #ifdefs you removed above are installed back. Not sure why. Thanks, Sekhar
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c index 8ac72831af05..a98aedae1b41 100644 --- a/drivers/net/ethernet/ti/davinci_mdio.c +++ b/drivers/net/ethernet/ti/davinci_mdio.c @@ -321,7 +321,6 @@ static int davinci_mdio_write(struct mii_bus *bus, int phy_id, return ret; } -#if IS_ENABLED(CONFIG_OF) static int davinci_mdio_probe_dt(struct mdio_platform_data *data, struct platform_device *pdev) { @@ -339,7 +338,6 @@ static int davinci_mdio_probe_dt(struct mdio_platform_data *data, return 0; } -#endif #if IS_ENABLED(CONFIG_OF) static const struct davinci_mdio_of_param of_cpsw_mdio_data = { @@ -374,7 +372,7 @@ static int davinci_mdio_probe(struct platform_device *pdev) return -ENOMEM; } - if (dev->of_node) { + if (IS_ENABLED(CONFIG_OF) && dev->of_node) { const struct of_device_id *of_id; ret = davinci_mdio_probe_dt(&data->pdata, pdev);
Test-building this driver on targets without CONFIG_OF revealed a build failure: drivers/net/ethernet/ti/davinci_mdio.c: In function 'davinci_mdio_probe': drivers/net/ethernet/ti/davinci_mdio.c:380:9: error: implicit declaration of function 'davinci_mdio_probe_dt'; did you mean 'davinci_mdio_probe'? [-Werror=implicit-function-declaration] This adjusts the #ifdef logic in the driver to make it build in all configurations. Fixes: 2652113ff043 ("net: ethernet: ti: Allow most drivers with COMPILE_TEST") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ethernet/ti/davinci_mdio.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.9.0