commit 6ae735f16b733fafacd1f26f5412d17df5e95b89
author Ray Smith <Raymond.Smith@arm.com> Thu Mar 21 15:57:18 2013 +0000
committer Ray Smith <raymond.smith@arm.com> Mon Mar 25 09:24:55 2013 +0000
tree dbfa867648fbbb05e472f1cc5cc56f6629dcb3d1
parent 9a3797b3dc04f51ecd78fed2973a62e33e26a0cc

Fix mixed code/declarations compiler warnings/errors

Also removed duplicated loops

Change-Id: Ie8eefc8266e4efb23d320411c1a2cd2899e9137d

src/omap_driver.c

diff --git a/src/omap_driver.c b/src/omap_driver.c
index 94ef511..1e488b1 100644
--- a/src/omap_driver.c
+++ b/src/omap_driver.c
@@ -974,23 +974,16 @@
 OMAPEnterVT(VT_FUNC_ARGS_DECL)
 {
 	SCRN_INFO_PTR(arg);
-	int i;
-
-	for (i = 1; i < currentMaxClients; i++) {
-		if (clients[i])
-			AttendClient(clients[i]);
-	}
-
 	OMAPPtr pOMAP = OMAPPTR(pScrn);
-	int ret;
-
-	for (i = 1; i < currentMaxClients; i++) {
-		if (clients[i])
-			AttendClient(clients[i]);
-	}
+	int i, ret;
 
 	TRACE_ENTER();
 
+	for (i = 1; i < currentMaxClients; i++) {
+		if (clients[i])
+			AttendClient(clients[i]);
+	}
+
 	ret = drmSetMaster(pOMAP->drmFD);
 	if (ret) {
 		ERROR_MSG("Cannot get DRM master: %s", strerror(errno));
@@ -1017,23 +1010,16 @@
 OMAPLeaveVT(VT_FUNC_ARGS_DECL)
 {
 	SCRN_INFO_PTR(arg);
-	int i;
-
-	for (i = 1; i < currentMaxClients; i++) {
-		if (clients[i])
-			IgnoreClient(clients[i]);
-	}
-
 	OMAPPtr pOMAP = OMAPPTR(pScrn);
-	int ret;
-
-	for (i = 1; i < currentMaxClients; i++) {
-		if (clients[i])
-			IgnoreClient(clients[i]);
-	}
+	int i, ret;
 
 	TRACE_ENTER();
 
+	for (i = 1; i < currentMaxClients; i++) {
+		if (clients[i])
+			IgnoreClient(clients[i]);
+	}
+
 	ret = drmDropMaster(pOMAP->drmFD);
 	if (ret) {
 		WARNING_MSG("drmDropMaster failed: %s", strerror(errno));