openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: stmmac: use device_property_read_u32_array to read the reset delays 

Change stmmac_mdio_reset() to use device_property_read_u32_array()
instead of of_property_read_u32_array().

This is meant as a cleanup because we can drop the struct device_node
variable. Also it will make it easier to get rid of struct
stmmac_mdio_bus_data (or at least make it private) in the future because
non-OF platforms can now pass the reset delays as device properties.

No functional changes (neither for OF platforms nor for ones that are
not using OF, because the modified code is still contained in an "if
(priv->device->of_node)").

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Martin Blumenstingl 2019-06-15 12:09:29 +02:00 committed by David S. Miller
parent 626c5fe423
commit 42a90766fe
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
View File

@ -24,9 +24,9 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/of.h>
#include <linux/of_mdio.h> #include <linux/of_mdio.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/property.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "dwxgmac2.h" #include "dwxgmac2.h"
@ -254,16 +254,15 @@ int stmmac_mdio_reset(struct mii_bus *bus)
struct gpio_desc *reset_gpio; struct gpio_desc *reset_gpio;
if (data->reset_gpio < 0) { if (data->reset_gpio < 0) {
struct device_node *np = priv->device->of_node;
reset_gpio = devm_gpiod_get_optional(priv->device, reset_gpio = devm_gpiod_get_optional(priv->device,
"snps,reset", "snps,reset",
GPIOD_OUT_LOW); GPIOD_OUT_LOW);
if (IS_ERR(reset_gpio)) if (IS_ERR(reset_gpio))
return PTR_ERR(reset_gpio); return PTR_ERR(reset_gpio);
of_property_read_u32_array(np, device_property_read_u32_array(priv->device,
"snps,reset-delays-us", data->delays, 3); "snps,reset-delays-us",
data->delays, 3);
} else { } else {
reset_gpio = gpio_to_desc(data->reset_gpio); reset_gpio = gpio_to_desc(data->reset_gpio);