diff options
| author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2019-07-02 00:42:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-03 00:23:43 +0200 |
| commit | cc5e92c22330aaf33b07c52db70ca80357b2cf4c (patch) | |
| tree | e79413715bfa58c8fb5406c50ae265a387f6f255 /drivers/net/ethernet/stmicro | |
| parent | bonding/main: fix NULL dereference in bond_select_active_slave() (diff) | |
| download | linux-cc5e92c22330aaf33b07c52db70ca80357b2cf4c.tar.xz linux-cc5e92c22330aaf33b07c52db70ca80357b2cf4c.zip | |
net: stmmac: make "snps,reset-delays-us" optional again
Commit 760f1dc2958022 ("net: stmmac: add sanity check to
device_property_read_u32_array call") introduced error checking of the
device_property_read_u32_array() call in stmmac_mdio_reset().
This results in the following error when the "snps,reset-delays-us"
property is not defined in devicetree:
invalid property snps,reset-delays-us
This sanity check made sense until commit 84ce4d0f9f55b4 ("net: stmmac:
initialize the reset delay array") ensured that there are fallback
values for the reset delay if the "snps,reset-delays-us" property is
absent. That was at the cost of making that property mandatory though.
Drop the sanity check for device_property_read_u32_array() and thus make
the "snps,reset-delays-us" property optional again (avoiding the error
message while loading the stmmac driver with a .dtb where the property
is absent).
Fixes: 760f1dc2958022 ("net: stmmac: add sanity check to device_property_read_u32_array call")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c index f8061e34122f..18cadf0b0d66 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c @@ -242,7 +242,6 @@ int stmmac_mdio_reset(struct mii_bus *bus) if (priv->device->of_node) { struct gpio_desc *reset_gpio; u32 delays[3] = { 0, 0, 0 }; - int ret; reset_gpio = devm_gpiod_get_optional(priv->device, "snps,reset", @@ -250,15 +249,9 @@ int stmmac_mdio_reset(struct mii_bus *bus) if (IS_ERR(reset_gpio)) return PTR_ERR(reset_gpio); - ret = device_property_read_u32_array(priv->device, - "snps,reset-delays-us", - delays, - ARRAY_SIZE(delays)); - if (ret) { - dev_err(ndev->dev.parent, - "invalid property snps,reset-delays-us\n"); - return -EINVAL; - } + device_property_read_u32_array(priv->device, + "snps,reset-delays-us", + delays, ARRAY_SIZE(delays)); if (delays[0]) msleep(DIV_ROUND_UP(delays[0], 1000)); |