diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-13 18:56:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-13 18:56:43 +0200 |
| commit | d980b8d1fc3c6a37f1123995d3939c6b0eeff1c5 (patch) | |
| tree | 60dbcae8697b5c2fc821c8bc2e12b93a64f5db3a /include | |
| parent | ibmvnic: Remove netdev notify for failover resets (diff) | |
| parent | mdio_bus: use devm_gpiod_get_optional() (diff) | |
| download | linux-d980b8d1fc3c6a37f1123995d3939c6b0eeff1c5.tar.xz linux-d980b8d1fc3c6a37f1123995d3939c6b0eeff1c5.zip | |
Merge branch 'MDIO-bus-reset-GPIO-cleanups'
Sergei Shtylyov says:
====================
MDIO bus reset GPIO cleanups
Commit 4c5e7a2c0501 ("dt-bindings: mdio: Clarify binding document")
declared that a MDIO reset GPIO property should have only a single GPIO
reference/specifier, however the supporting code was left intact...
Here's a couple of the obvious cleanups to that code:
[1/2] mdio_bus: handle only single PHY reset GPIO
[2/2] mdio_bus: use devm_gpiod_get_optional()
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/phy.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 414242200a90..51bea6593409 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -226,10 +226,8 @@ struct mii_bus { /* GPIO reset pulse width in microseconds */ int reset_delay_us; - /* Number of reset GPIOs */ - int num_reset_gpios; - /* Array of RESET GPIO descriptors */ - struct gpio_desc **reset_gpiod; + /* RESET GPIO descriptor pointer */ + struct gpio_desc *reset_gpiod; }; #define to_mii_bus(d) container_of(d, struct mii_bus, dev) |