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:
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)
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:
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)
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:
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)
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:
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)