Add get_lcd_power_node() for direct accessing the lcd power node

Change-Id: Id47db38af56b2f6b6e4be0e6b46acf79b0564d75
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/plugins/iot/display/device-interface.c b/plugins/iot/display/device-interface.c
index eba4550..27fde01 100644 (file)
--- a/plugins/iot/display/device-interface.c
+++ b/plugins/iot/display/device-interface.c
@@ -124,25 +124,22 @@ static int bl_brt(int brightness, int delay)
        return ret;
 }
 
-static int get_lcd_power(void)
+static int get_lcd_power_node(void)
 {
-       enum display_state val;
        int ret;
+       enum display_state val;
 
-       if (!display_dev || !display_dev->get_state) {
-               return dpms_get_state();
-       } else {
-               ret = display_dev->get_state(&val);
-               if (ret < 0)
-                       return ret;
+       ret = display_dev->get_state(&val);
+       if (ret < 0)
+               return ret;
 
-               if (val == DISPLAY_ON && ambient_get_state())
-                       return DPMS_OFF;
+       if (val == DISPLAY_ON && ambient_get_state())
+               return DPMS_OFF;
 
-               if (dpms_running_state != DPMS_SETTING_DONE)
-                       return dpms_running_state;
+       if (dpms_running_state != DPMS_SETTING_DONE)
+               return dpms_running_state;
 
-               switch (val) {
+       switch (val) {
                case DISPLAY_ON:
                        return DPMS_ON;
                case DISPLAY_STANDBY:
@@ -153,10 +150,17 @@ static int get_lcd_power(void)
                        return DPMS_OFF;
                default:
                        return -EINVAL;
-               }
        }
 }
 
+static int get_lcd_power(void)
+{
+       if (display_dev && display_dev->get_state)
+               return get_lcd_power_node();
+       else
+               return dpms_get_state();
+}
+
 bool display_dimstay_check(void)
 {
        if (get_pm_status_flag() & DIM_FLAG)

diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c
index 80b1d01..d9b5d3b 100644 (file)
--- a/plugins/mobile/display/device-interface.c
+++ b/plugins/mobile/display/device-interface.c
@@ -123,25 +123,22 @@ static int bl_brt(int brightness, int delay)
        return ret;
 }
 
-static int get_lcd_power(void)
+static int get_lcd_power_node(void)
 {
-       enum display_state val;
        int ret;
+       enum display_state val;
 
-       if (!display_dev || !display_dev->get_state) {
-               return dpms_get_state();
-       } else {
-               ret = display_dev->get_state(&val);
-               if (ret < 0)
-                       return ret;
+       ret = display_dev->get_state(&val);
+       if (ret < 0)
+               return ret;
 
-               if (val == DISPLAY_ON && ambient_get_state())
-                       return DPMS_OFF;
+       if (val == DISPLAY_ON && ambient_get_state())
+               return DPMS_OFF;
 
-               if (dpms_running_state != DPMS_SETTING_DONE)
-                       return dpms_running_state;
+       if (dpms_running_state != DPMS_SETTING_DONE)
+               return dpms_running_state;
 
-               switch (val) {
+       switch (val) {
                case DISPLAY_ON:
                        return DPMS_ON;
                case DISPLAY_STANDBY:
@@ -152,10 +149,17 @@ static int get_lcd_power(void)
                        return DPMS_OFF;
                default:
                        return -EINVAL;
-               }
        }
 }
 
+static int get_lcd_power(void)
+{
+       if (display_dev && display_dev->get_state)
+               return get_lcd_power_node();
+       else
+               return dpms_get_state();
+}
+
 bool display_dimstay_check(void)
 {
        if (get_pm_status_flag() & DIM_FLAG)

diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c
index e7ab4df..e264290 100644 (file)
--- a/plugins/tv/display/device-interface.c
+++ b/plugins/tv/display/device-interface.c
@@ -124,25 +124,22 @@ static int bl_brt(int brightness, int delay)
        return ret;
 }
 
-static int get_lcd_power(void)
+static int get_lcd_power_node(void)
 {
-       enum display_state val;
        int ret;
+       enum display_state val;
 
-       if (!display_dev || !display_dev->get_state) {
-               return dpms_get_state();
-       } else {
-               ret = display_dev->get_state(&val);
-               if (ret < 0)
-                       return ret;
+       ret = display_dev->get_state(&val);
+       if (ret < 0)
+               return ret;
 
-               if (val == DISPLAY_ON && ambient_get_state())
-                       return DPMS_OFF;
+       if (val == DISPLAY_ON && ambient_get_state())
+               return DPMS_OFF;
 
-               if (dpms_running_state != DPMS_SETTING_DONE)
-                       return dpms_running_state;
+       if (dpms_running_state != DPMS_SETTING_DONE)
+               return dpms_running_state;
 
-               switch (val) {
+       switch (val) {
                case DISPLAY_ON:
                        return DPMS_ON;
                case DISPLAY_STANDBY:
@@ -153,10 +150,17 @@ static int get_lcd_power(void)
                        return DPMS_OFF;
                default:
                        return -EINVAL;
-               }
        }
 }
 
+static int get_lcd_power(void)
+{
+       if (display_dev && display_dev->get_state)
+               return get_lcd_power_node();
+       else
+               return dpms_get_state();
+}
+
 bool display_dimstay_check(void)
 {
        if (get_pm_status_flag() & DIM_FLAG)

diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c
index 2e5351c..e95977b 100644 (file)
--- a/plugins/wearable/display/device-interface.c
+++ b/plugins/wearable/display/device-interface.c
@@ -136,25 +136,22 @@ static int bl_brt(int brightness, int delay)
        return ret;
 }
 
-static int get_lcd_power(void)
+static int get_lcd_power_node(void)
 {
-       enum display_state val;
        int ret;
+       enum display_state val;
 
-       if (!display_dev || !display_dev->get_state) {
-               return dpms_get_state();
-       } else {
-               ret = display_dev->get_state(&val);
-               if (ret < 0)
-                       return ret;
+       ret = display_dev->get_state(&val);
+       if (ret < 0)
+               return ret;
 
-               if (val == DISPLAY_ON && ambient_get_state())
-                       return DPMS_OFF;
+       if (val == DISPLAY_ON && ambient_get_state())
+               return DPMS_OFF;
 
-               if (dpms_running_state != DPMS_SETTING_DONE)
-                       return dpms_running_state;
+       if (dpms_running_state != DPMS_SETTING_DONE)
+               return dpms_running_state;
 
-               switch (val) {
+       switch (val) {
                case DISPLAY_ON:
                        return DPMS_ON;
                case DISPLAY_STANDBY:
@@ -167,10 +164,17 @@ static int get_lcd_power(void)
                        return DPMS_DETACH;
                default:
                        return -EINVAL;
-               }
        }
 }
 
+static int get_lcd_power(void)
+{
+       if (display_dev && display_dev->get_state)
+               return get_lcd_power_node();
+       else
+               return dpms_get_state();
+}
+
 bool display_dimstay_check(void)
 {
        if (get_pm_status_flag() & DIM_FLAG)