From: Mathias Kresin <dev@kresin.me>
Date: Tue, 4 Oct 2016 18:30:34 +0000 (+0200)
Subject: lantiq: cleanup led handling functions
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8b639410d188a979783cc57f9a4fedbcd362bf10;p=openwrt%2Fstaging%2Fzorun.git

lantiq: cleanup led handling functions

Use a more generic name for the lantiq_get_dt_led_chosen function.

Drop the lantiq_is_dt_led_chosen function. The lantiq_get_dt_led
function can be used to achieve the same.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---

diff --git a/target/linux/lantiq/base-files/etc/board.d/01_leds b/target/linux/lantiq/base-files/etc/board.d/01_leds
index 4c3dab7398..d215393ba4 100755
--- a/target/linux/lantiq/base-files/etc/board.d/01_leds
+++ b/target/linux/lantiq/base-files/etc/board.d/01_leds
@@ -9,19 +9,26 @@
 
 board_config_update
 
-[ -n "$(lantiq_is_dt_led_chosen wifi)" ] && ucidef_set_led_wlan "wifi" "wifi" "$(lantiq_get_dt_led_chosen wifi)" "phy0tpt"
-[ -n "$(lantiq_is_dt_led_chosen usb)" ] && ucidef_set_led_usbdev "usb" "usb" "$(lantiq_get_dt_led_chosen usb)" "1-1"
-[ -n "$(lantiq_is_dt_led_chosen usb2)" ] && ucidef_set_led_usbdev "usb2" "usb2" "$(lantiq_get_dt_led_chosen usb2)" "2-1"
+led_wifi="$(lantiq_get_dt_led wifi)"
+[ -n "$led_wifi" ] && ucidef_set_led_wlan "wifi" "wifi" "$led_wifi" "phy0tpt"
 
-[ -n "$(lantiq_is_dt_led_chosen internet)" ] && {
+led_usb="$(lantiq_get_dt_led usb)"
+[ -n "$led_usb" ] && ucidef_set_led_usbdev "usb" "usb" "$led_usb" "1-1"
+
+led_usb2="$(lantiq_get_dt_led usb2)"
+[ -n "$led_usb2" ] && ucidef_set_led_usbdev "usb2" "usb2" "$led_usb2" "2-1"
+
+led_internet="$(lantiq_get_dt_led internet)"
+[ -n "$led_internet" ] && {
 	interface="nas0"
 
-	[ -n "$(lantiq_is_dt_led_chosen dsl)" ] && {
+	led_dsl="$(lantiq_get_dt_led dsl)"
+	[ -n "$led_dsl" ] && {
 		interface="pppoe-wan"
-		ucidef_set_led_default "dsl" "dsl" "$(lantiq_get_dt_led_chosen dsl)" "0"
+		ucidef_set_led_default "dsl" "dsl" "$led_dsl" "0"
 	}
 
-	ucidef_set_led_netdev "internet" "internet" "$(lantiq_get_dt_led_chosen internet)" "$interface"
+	ucidef_set_led_netdev "internet" "internet" "$led_internet" "$interface"
 }
 
 board=$(lantiq_board_name)
diff --git a/target/linux/lantiq/base-files/etc/diag.sh b/target/linux/lantiq/base-files/etc/diag.sh
index f6363b34ac..70ed25cb80 100644
--- a/target/linux/lantiq/base-files/etc/diag.sh
+++ b/target/linux/lantiq/base-files/etc/diag.sh
@@ -4,9 +4,9 @@
 . /lib/functions/leds.sh
 . /lib/functions/lantiq.sh
 
-boot="$(lantiq_get_dt_led_chosen boot)"
-failsafe="$(lantiq_get_dt_led_chosen failsafe)"
-running="$(lantiq_get_dt_led_chosen running)"
+boot="$(lantiq_get_dt_led boot)"
+failsafe="$(lantiq_get_dt_led failsafe)"
+running="$(lantiq_get_dt_led running)"
 
 set_state() {
     status_led="$boot"
diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq.sh b/target/linux/lantiq/base-files/lib/functions/lantiq.sh
index 642ae6b725..456e54bb3f 100644
--- a/target/linux/lantiq/base-files/lib/functions/lantiq.sh
+++ b/target/linux/lantiq/base-files/lib/functions/lantiq.sh
@@ -28,18 +28,14 @@ lantiq_board_name() {
 	echo "$name"
 }
 
-lantiq_is_dt_led_chosen() {
-	[ -f "/sys/firmware/devicetree/base/chosen/leds/$1" ] && echo "true"
-}
-
-lantiq_get_dt_led_chosen() {
+lantiq_get_dt_led() {
 	local label
-	local nodepath
+	local ledpath
 	local basepath="/sys/firmware/devicetree/base"
-	local chosenpath="$basepath/chosen/leds/$1"
+	local nodepath="$basepath/chosen/leds/$1"
 
-	[ -f "$chosenpath" ] && nodepath=$(cat "$chosenpath")
-	[ -n "$nodepath" ] && label=$(cat "$basepath$nodepath/label")
+	[ -f "$nodepath" ] && ledpath=$(cat "$nodepath")
+	[ -n "$ledpath" ] && label=$(cat "$basepath$ledpath/label")
 
 	echo "$label"
 }