summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-04-23 13:21:32 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-04-23 13:21:32 -0400
commite95488ded57f71b552efdf17a8a77a4208a97185 (patch)
tree36319642746309aaa1ccba02420acf8632526b91
parente6ed330dceba8ab96e2f406ad67a5ce019cb445f (diff)
downloadefl-e95488ded57f71b552efdf17a8a77a4208a97185.tar.gz
ecore-drm: refactor _ecore_drm_output_backlight_init() to use fewer gotos
-rw-r--r--src/lib/ecore_drm/ecore_drm_output.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/src/lib/ecore_drm/ecore_drm_output.c b/src/lib/ecore_drm/ecore_drm_output.c
index 9699e9803b..dbcd088caf 100644
--- a/src/lib/ecore_drm/ecore_drm_output.c
+++ b/src/lib/ecore_drm/ecore_drm_output.c
@@ -352,27 +352,24 @@ _ecore_drm_output_backlight_init(Ecore_Drm_Output *output, uint32_t conn_type)
else if (!strcmp(devtype, "firmware"))
type = ECORE_DRM_BACKLIGHT_FIRMWARE;
- if ((conn_type != DRM_MODE_CONNECTOR_LVDS) &&
- (conn_type != DRM_MODE_CONNECTOR_eDP))
- {
- if (type != ECORE_DRM_BACKLIGHT_RAW) goto cont;
- }
+ if ((conn_type == DRM_MODE_CONNECTOR_LVDS) ||
+ (conn_type == DRM_MODE_CONNECTOR_eDP) ||
+ (type == ECORE_DRM_BACKLIGHT_RAW))
+ found = EINA_TRUE;
- found = EINA_TRUE;
-cont:
eina_stringshare_del(devtype);
if (found) break;
}
- if (!found) goto out;
-
- if ((backlight = calloc(1, sizeof(Ecore_Drm_Backlight))))
+ if (found)
{
- backlight->type = type;
- backlight->device = eina_stringshare_add(device);
+ if ((backlight = calloc(1, sizeof(Ecore_Drm_Backlight))))
+ {
+ backlight->type = type;
+ backlight->device = eina_stringshare_add(device);
+ }
}
-out:
EINA_LIST_FREE(devs, device)
eina_stringshare_del(device);