summaryrefslogtreecommitdiffstats
path: root/drivers/staging/octeon/ethernet-mdio.h
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2020-07-07 03:49:39 +0200
committerDavid S. Miller <davem@davemloft.net>2020-07-07 12:47:11 -0700
commit791e5f61aec5a1332a8f760f43a6d32c416df602 (patch)
treedd7199f1d30da213fd32d83b33d01d2aae27c8cd /drivers/staging/octeon/ethernet-mdio.h
parentc7b04d1030f505f2d883612ed31a6ddd70182705 (diff)
downloadlinux-791e5f61aec5a1332a8f760f43a6d32c416df602.tar.bz2
net: phy: mdio-octeon: Cleanup module loading dependencies
To ensure that the octeon MDIO driver has been loaded, the Cavium ethernet drivers reference a dummy symbol in the MDIO driver. This forces it to be loaded first. And this symbol has not been cleanly implemented, resulting in warnings when build W=1 C=1. Since device tree is being used, and a phandle points to the PHY on the MDIO bus, we can make use of deferred probing. If the PHY fails to connect, it should be because the MDIO bus driver has not loaded yet. Return -EPROBE_DEFER so it will be tried again later. Additionally, add a MODULE_SOFTDEP() to give user space a hint as to what order it should load the modules. v2: s/octoen/octeon/ Add MODULE_SOFTDEP() Cc: Sunil Goutham <sgoutham@marvell.com> Cc: Robert Richter <rrichter@marvell.com> Cc: Chris Packham <chris.packham@alliedtelesis.co.nz> Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/staging/octeon/ethernet-mdio.h')
-rw-r--r--drivers/staging/octeon/ethernet-mdio.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/octeon/ethernet-mdio.h b/drivers/staging/octeon/ethernet-mdio.h
index e3771d48c49b..7f6716e3fad4 100644
--- a/drivers/staging/octeon/ethernet-mdio.h
+++ b/drivers/staging/octeon/ethernet-mdio.h
@@ -22,7 +22,5 @@
extern const struct ethtool_ops cvm_oct_ethtool_ops;
-void octeon_mdiobus_force_mod_depencency(void);
-
int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
int cvm_oct_phy_setup_device(struct net_device *dev);