]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net: davinci: fix building davinci mdio code without CONFIG_OF
authorArnd Bergmann <arnd@arndb.de>
Mon, 28 May 2018 15:50:20 +0000 (17:50 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 May 2018 17:21:23 +0000 (13:21 -0400)
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>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/davinci_mdio.c

index 8ac72831af050c15e2434f93711e81e8dd7e5cde..a98aedae1b41d7baa424d6b5a51622ec3af5bee0 100644 (file)
@@ -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);