]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
net: dsa: mv88e6xxx: use gpio get optional variant
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>
Mon, 20 Jun 2016 17:14:03 +0000 (13:14 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Jun 2016 07:58:29 +0000 (03:58 -0400)
Use the optional variant to get the reset GPIO line, instead of checking
for the -ENOENT error.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/mv88e6xxx.c

index ad7735dcae844061e3066a045718c2e185329df7..ec28465ee323a58bbb08e04e08ba764057fd4343 100644 (file)
@@ -3744,16 +3744,9 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
        if (!ps->info)
                return -ENODEV;
 
-       ps->reset = devm_gpiod_get(dev, "reset", GPIOD_ASIS);
-       if (IS_ERR(ps->reset)) {
-               err = PTR_ERR(ps->reset);
-               if (err == -ENOENT) {
-                       /* Optional, so not an error */
-                       ps->reset = NULL;
-               } else {
-                       return err;
-               }
-       }
+       ps->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_ASIS);
+       if (IS_ERR(ps->reset))
+               return PTR_ERR(ps->reset);
 
        if (mv88e6xxx_has(ps, MV88E6XXX_FLAG_EEPROM) &&
            !of_property_read_u32(np, "eeprom-length", &eeprom_len))