Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 18 deletions

diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 9762dd6d99fa..9b44c49a9227 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -343,36 +343,27 @@ struct gpio_desc *of_find_gpio(struct device *dev, const char *con_id,
 
                 desc = of_get_named_gpiod_flags(dev->of_node, prop_name, idx,
                                                 &of_flags);
-                /*
-                 * -EPROBE_DEFER in our case means that we found a
-                 * valid GPIO property, but no controller has been
-                 * registered so far.
-                 *
-                 * This means we don't need to look any further for
-                 * alternate name conventions, and we should really
-                 * preserve the return code for our user to be able to
-                 * retry probing later.
-                 */
-                if (IS_ERR(desc) && PTR_ERR(desc) == -EPROBE_DEFER)
-                        return desc;
 
-                if (!IS_ERR(desc) || (PTR_ERR(desc) != -ENOENT))
+                if (!IS_ERR(desc) || PTR_ERR(desc) != -ENOENT)
                         break;
         }
 
-        /* Special handling for SPI GPIOs if used */
-        if (IS_ERR(desc))
+        if (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT) {
+                /* Special handling for SPI GPIOs if used */
                 desc = of_find_spi_gpio(dev, con_id, &of_flags);
-        if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER) {
+        }
+
+        if (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT) {
                 /* This quirk looks up flags and all */
                 desc = of_find_spi_cs_gpio(dev, con_id, idx, flags);
                 if (!IS_ERR(desc))
                         return desc;
         }
 
-        /* Special handling for regulator GPIOs if used */
-        if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER)
+        if (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT) {
+                /* Special handling for regulator GPIOs if used */
                 desc = of_find_regulator_gpio(dev, con_id, &of_flags);
+        }
 
         if (IS_ERR(desc))
                 return desc;