Skip to content

Commit

Permalink
net: dsa: hellcreek: Get rid of custom led_init_default_state_get()
Browse files Browse the repository at this point in the history
LED core provides a helper to parse default state from firmware node.
Use it instead of custom implementation.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Link: https://lore.kernel.org/r/20230314181824.56881-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Andy Shevchenko authored and Jakub Kicinski committed Mar 17, 2023
1 parent cc6d85c commit d565263
Showing 1 changed file with 24 additions and 21 deletions.
45 changes: 24 additions & 21 deletions drivers/net/dsa/hirschmann/hellcreek_ptp.c
Original file line number Diff line number Diff line change
@@ -297,7 +297,8 @@ static enum led_brightness hellcreek_led_is_gm_get(struct led_classdev *ldev)
static int hellcreek_led_setup(struct hellcreek *hellcreek)
{
struct device_node *leds, *led = NULL;
const char *label, *state;
enum led_default_state state;
const char *label;
int ret = -EINVAL;

of_node_get(hellcreek->dev->of_node);
@@ -318,16 +319,17 @@ static int hellcreek_led_setup(struct hellcreek *hellcreek)
ret = of_property_read_string(led, "label", &label);
hellcreek->led_sync_good.name = ret ? "sync_good" : label;

ret = of_property_read_string(led, "default-state", &state);
if (!ret) {
if (!strcmp(state, "on"))
hellcreek->led_sync_good.brightness = 1;
else if (!strcmp(state, "off"))
hellcreek->led_sync_good.brightness = 0;
else if (!strcmp(state, "keep"))
hellcreek->led_sync_good.brightness =
hellcreek_get_brightness(hellcreek,
STATUS_OUT_SYNC_GOOD);
state = led_init_default_state_get(of_fwnode_handle(led));
switch (state) {
case LEDS_DEFSTATE_ON:
hellcreek->led_sync_good.brightness = 1;
break;
case LEDS_DEFSTATE_KEEP:
hellcreek->led_sync_good.brightness =
hellcreek_get_brightness(hellcreek, STATUS_OUT_SYNC_GOOD);
break;
default:
hellcreek->led_sync_good.brightness = 0;
}

hellcreek->led_sync_good.max_brightness = 1;
@@ -344,16 +346,17 @@ static int hellcreek_led_setup(struct hellcreek *hellcreek)
ret = of_property_read_string(led, "label", &label);
hellcreek->led_is_gm.name = ret ? "is_gm" : label;

ret = of_property_read_string(led, "default-state", &state);
if (!ret) {
if (!strcmp(state, "on"))
hellcreek->led_is_gm.brightness = 1;
else if (!strcmp(state, "off"))
hellcreek->led_is_gm.brightness = 0;
else if (!strcmp(state, "keep"))
hellcreek->led_is_gm.brightness =
hellcreek_get_brightness(hellcreek,
STATUS_OUT_IS_GM);
state = led_init_default_state_get(of_fwnode_handle(led));
switch (state) {
case LEDS_DEFSTATE_ON:
hellcreek->led_is_gm.brightness = 1;
break;
case LEDS_DEFSTATE_KEEP:
hellcreek->led_is_gm.brightness =
hellcreek_get_brightness(hellcreek, STATUS_OUT_IS_GM);
break;
default:
hellcreek->led_is_gm.brightness = 0;
}

hellcreek->led_is_gm.max_brightness = 1;

0 comments on commit d565263

Please sign in to comment.