Merge tag 'csky-for-linus-5.14-rc1' of git://github.com/c-sky/csky-linux

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

diff --git a/drivers/leds/leds-el15203000.c b/drivers/leds/leds-el15203000.c
index 6ca47f2..76b455e 100644 (file)
--- a/drivers/leds/leds-el15203000.c
+++ b/drivers/leds/leds-el15203000.c
@@ -68,8 +68,8 @@ enum el15203000_command {
 };
 
 struct el15203000_led {
-       struct el15203000       *priv;
        struct led_classdev     ldev;
+       struct el15203000       *priv;
        u32                     reg;
 };
 
@@ -82,6 +82,8 @@ struct el15203000 {
        struct el15203000_led   leds[];
 };
 
+#define to_el15203000_led(d)   container_of(d, struct el15203000_led, ldev)
+
 static int el15203000_cmd(struct el15203000_led *led, u8 brightness)
 {
        int             ret;
@@ -128,9 +130,7 @@ static int el15203000_cmd(struct el15203000_led *led, u8 brightness)
 static int el15203000_set_blocking(struct led_classdev *ldev,
                                   enum led_brightness brightness)
 {
-       struct el15203000_led *led = container_of(ldev,
-                                                 struct el15203000_led,
-                                                 ldev);
+       struct el15203000_led *led = to_el15203000_led(ldev);
 
        return el15203000_cmd(led, brightness == LED_OFF ? EL_OFF : EL_ON);
 }
@@ -139,9 +139,7 @@ static int el15203000_pattern_set_S(struct led_classdev *ldev,
                                    struct led_pattern *pattern,
                                    u32 len, int repeat)
 {
-       struct el15203000_led *led = container_of(ldev,
-                                                 struct el15203000_led,
-                                                 ldev);
+       struct el15203000_led *led = to_el15203000_led(ldev);
 
        if (repeat > 0 || len != 2 ||
            pattern[0].delta_t != 4000 || pattern[0].brightness != 0 ||
@@ -192,10 +190,8 @@ static int el15203000_pattern_set_P(struct led_classdev *ldev,
                                    struct led_pattern *pattern,
                                    u32 len, int repeat)
 {
+       struct el15203000_led   *led = to_el15203000_led(ldev);
        u8                      cmd;
-       struct el15203000_led   *led = container_of(ldev,
-                                                   struct el15203000_led,
-                                                   ldev);
 
        if (repeat > 0)
                return -EINVAL;
@@ -232,9 +228,7 @@ static int el15203000_pattern_set_P(struct led_classdev *ldev,
 
 static int el15203000_pattern_clear(struct led_classdev *ldev)
 {
-       struct el15203000_led   *led = container_of(ldev,
-                                                   struct el15203000_led,
-                                                   ldev);
+       struct el15203000_led *led = to_el15203000_led(ldev);
 
        return el15203000_cmd(led, EL_OFF);
 }
@@ -251,16 +245,13 @@ static int el15203000_probe_dt(struct el15203000 *priv)
                ret = fwnode_property_read_u32(child, "reg", &led->reg);
                if (ret) {
                        dev_err(priv->dev, "LED without ID number");
-                       fwnode_handle_put(child);
-
-                       break;
+                       goto err_child_out;
                }
 
                if (led->reg > U8_MAX) {
                        dev_err(priv->dev, "LED value %d is invalid", led->reg);
-                       fwnode_handle_put(child);
-
-                       return -EINVAL;
+                       ret = -EINVAL;
+                       goto err_child_out;
                }
 
                led->priv                         = priv;
@@ -282,14 +273,16 @@ static int el15203000_probe_dt(struct el15203000 *priv)
                        dev_err(priv->dev,
                                "failed to register LED device %s, err %d",
                                led->ldev.name, ret);
-                       fwnode_handle_put(child);
-
-                       break;
+                       goto err_child_out;
                }
 
                led++;
        }
 
+       return 0;
+
+err_child_out:
+       fwnode_handle_put(child);
        return ret;
 }