diff options
| author | Antoine Tenart <antoine.tenart@bootlin.com> | 2018-05-22 12:18:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-23 14:34:27 -0400 |
| commit | 66ede1f9c9466cdf866b4be40a814a140d5df60a (patch) | |
| tree | 66b10a401d0d7129812c338b853fccc8c3f9e5a8 | |
| parent | a1f5d1f0dfccea54e1d9c2da16fd8c9b54f81a75 (diff) | |
| download | blackbird-obmc-linux-66ede1f9c9466cdf866b4be40a814a140d5df60a.tar.gz blackbird-obmc-linux-66ede1f9c9466cdf866b4be40a814a140d5df60a.zip | |
net: phy: sfp: make the i2c-bus dt property mandatory
This patch makes the i2c-bus property mandatory when using a device
tree. If the sfp i2c bus isn't described it's impossible to guess the
protocol to use for a given module, and the sfp module would then not
work in most cases.
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/sfp.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index a91d12209a81..c4c92db86dfa 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -976,6 +976,7 @@ static int sfp_probe(struct platform_device *pdev) if (pdev->dev.of_node) { struct device_node *node = pdev->dev.of_node; const struct of_device_id *id; + struct i2c_adapter *i2c; struct device_node *np; id = of_match_node(sfp_of_match, node); @@ -985,19 +986,20 @@ static int sfp_probe(struct platform_device *pdev) sff = sfp->type = id->data; np = of_parse_phandle(node, "i2c-bus", 0); - if (np) { - struct i2c_adapter *i2c; - - i2c = of_find_i2c_adapter_by_node(np); - of_node_put(np); - if (!i2c) - return -EPROBE_DEFER; - - err = sfp_i2c_configure(sfp, i2c); - if (err < 0) { - i2c_put_adapter(i2c); - return err; - } + if (!np) { + dev_err(sfp->dev, "missing 'i2c-bus' property\n"); + return -ENODEV; + } + + i2c = of_find_i2c_adapter_by_node(np); + of_node_put(np); + if (!i2c) + return -EPROBE_DEFER; + + err = sfp_i2c_configure(sfp, i2c); + if (err < 0) { + i2c_put_adapter(i2c); + return err; } } |
