Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / leds / leds-lm3697.c

diff --git a/drivers/leds/leds-lm3697.c b/drivers/leds/leds-lm3697.c
index 970a4f3..a8c9322 100644 (file)
--- a/drivers/leds/leds-lm3697.c
+++ b/drivers/leds/leds-lm3697.c
@@ -2,11 +2,16 @@
 // TI LM3697 LED chip family driver
 // Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/
 
+#include <linux/bits.h>
 #include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
-#include <linux/of.h>
-#include <linux/of_gpio.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/property.h>
+#include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
+#include <linux/types.h>
+
 #include <linux/leds-ti-lmu-common.h>
 
 #define LM3697_REV                     0x0
@@ -221,14 +226,12 @@ static int lm3697_probe_dt(struct lm3697 *priv)
                ret = fwnode_property_read_u32(child, "reg", &control_bank);
                if (ret) {
                        dev_err(dev, "reg property missing\n");
-                       fwnode_handle_put(child);
                        goto child_out;
                }
 
                if (control_bank > LM3697_CONTROL_B) {
                        dev_err(dev, "reg property is invalid\n");
                        ret = -EINVAL;
-                       fwnode_handle_put(child);
                        goto child_out;
                }
 
@@ -259,7 +262,6 @@ static int lm3697_probe_dt(struct lm3697 *priv)
                                                    led->num_leds);
                if (ret) {
                        dev_err(dev, "led-sources property missing\n");
-                       fwnode_handle_put(child);
                        goto child_out;
                }
 
@@ -284,14 +286,16 @@ static int lm3697_probe_dt(struct lm3697 *priv)
                                                     &init_data);
                if (ret) {
                        dev_err(dev, "led register err: %d\n", ret);
-                       fwnode_handle_put(child);
                        goto child_out;
                }
 
                i++;
        }
 
+       return ret;
+
 child_out:
+       fwnode_handle_put(child);
        return ret;
 }