lkml.org 
[lkml]   [2020]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/15] net: phy: mdio: reset MDIO devices even if probe() is not implemented
    Date
    From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

    Similarily to PHY drivers - there's no reason to require probe() to be
    implemented in order to call mdio_device_reset(). MDIO devices can have
    resets defined without needing to do anything in probe().

    Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
    ---
    drivers/net/phy/mdio_device.c | 13 ++++++-------
    1 file changed, 6 insertions(+), 7 deletions(-)

    diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c
    index f60443e48622..be615504b829 100644
    --- a/drivers/net/phy/mdio_device.c
    +++ b/drivers/net/phy/mdio_device.c
    @@ -150,10 +150,10 @@ static int mdio_probe(struct device *dev)
    struct mdio_driver *mdiodrv = to_mdio_driver(drv);
    int err = 0;

    - if (mdiodrv->probe) {
    - /* Deassert the reset signal */
    - mdio_device_reset(mdiodev, 0);
    + /* Deassert the reset signal */
    + mdio_device_reset(mdiodev, 0);

    + if (mdiodrv->probe) {
    err = mdiodrv->probe(mdiodev);
    if (err) {
    /* Assert the reset signal */
    @@ -170,12 +170,11 @@ static int mdio_remove(struct device *dev)
    struct device_driver *drv = mdiodev->dev.driver;
    struct mdio_driver *mdiodrv = to_mdio_driver(drv);

    - if (mdiodrv->remove) {
    + if (mdiodrv->remove)
    mdiodrv->remove(mdiodev);

    - /* Assert the reset signal */
    - mdio_device_reset(mdiodev, 1);
    - }
    + /* Assert the reset signal */
    + mdio_device_reset(mdiodev, 1);

    return 0;
    }
    --
    2.26.1
    \
     
     \ /
      Last update: 2020-06-22 11:44    [W:4.184 / U:0.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site