Index: uspace/srv/hid/input/ctl/kbdev.c
===================================================================
--- uspace/srv/hid/input/ctl/kbdev.c	(revision 2f90b46749b0b0b689233324cb5f2489bd7b57a3)
+++ uspace/srv/hid/input/ctl/kbdev.c	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
@@ -68,5 +68,5 @@
 	/** Link to generic keyboard device */
 	kbd_dev_t *kbd_dev;
-
+	
 	/** Session with kbdev device */
 	async_sess_t *sess;
@@ -75,10 +75,8 @@
 static kbdev_t *kbdev_new(kbd_dev_t *kdev)
 {
-	kbdev_t *kbdev;
-
-	kbdev = calloc(1, sizeof(kbdev_t));
+	kbdev_t *kbdev = calloc(1, sizeof(kbdev_t));
 	if (kbdev == NULL)
 		return NULL;
-
+	
 	kbdev->kbd_dev = kdev;
 
@@ -90,4 +88,5 @@
 	if (kbdev->sess != NULL)
 		async_hangup(kbdev->sess);
+	
 	free(kbdev);
 }
@@ -95,35 +94,31 @@
 static int kbdev_ctl_init(kbd_dev_t *kdev)
 {
-	async_sess_t *sess;
-	async_exch_t *exch;
-	kbdev_t *kbdev;
-	int rc;
-
-	sess = loc_service_connect(EXCHANGE_SERIALIZE, kdev->svc_id, 0);
+	async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE,
+	    kdev->svc_id, 0);
 	if (sess == NULL) {
 		printf("%s: Failed starting session with '%s.'\n", NAME,
 		    kdev->svc_name);
-		return -1;
+		return ENOENT;
 	}
-
-	kbdev = kbdev_new(kdev);
+	
+	kbdev_t *kbdev = kbdev_new(kdev);
 	if (kbdev == NULL) {
 		printf("%s: Failed allocating device structure for '%s'.\n",
 		    NAME, kdev->svc_name);
 		async_hangup(sess);
-		return -1;
+		return ENOMEM;
 	}
-
+	
 	kbdev->sess = sess;
-
-	exch = async_exchange_begin(sess);
+	
+	async_exch_t *exch = async_exchange_begin(sess);
 	if (exch == NULL) {
 		printf("%s: Failed starting exchange with '%s'.\n", NAME,
 		    kdev->svc_name);
 		kbdev_destroy(kbdev);
-		return -1;
+		return ENOENT;
 	}
-
-	rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev);
+	
+	int rc = async_connect_to_me(exch, 0, 0, 0, kbdev_callback_conn, kbdev);
 	if (rc != EOK) {
 		printf("%s: Failed creating callback connection from '%s'.\n",
@@ -131,9 +126,9 @@
 		async_exchange_end(exch);
 		kbdev_destroy(kbdev);
-		return -1;
+		return rc;
 	}
-
+	
 	async_exchange_end(exch);
-
+	
 	kdev->ctl_private = (void *) kbdev;
 	return 0;
@@ -142,13 +137,9 @@
 static void kbdev_ctl_set_ind(kbd_dev_t *kdev, unsigned mods)
 {
-	async_sess_t *sess;
-	async_exch_t *exch;
-
-	sess = ((kbdev_t *) kdev->ctl_private)->sess;
-
-	exch = async_exchange_begin(sess);
+	async_sess_t *sess = ((kbdev_t *) kdev->ctl_private)->sess;
+	async_exch_t *exch = async_exchange_begin(sess);
 	if (!exch)
 		return;
-
+	
 	async_msg_1(exch, KBDEV_SET_IND, mods);
 	async_exchange_end(exch);
Index: uspace/srv/hid/input/generic/input.c
===================================================================
--- uspace/srv/hid/input/generic/input.c	(revision 2f90b46749b0b0b689233324cb5f2489bd7b57a3)
+++ uspace/srv/hid/input/generic/input.c	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
@@ -662,7 +662,7 @@
 	async_set_client_connection(client_connection);
 	int rc = loc_server_register(NAME);
-	if (rc < 0) {
-		printf("%s: Unable to register server (%d)\n", NAME, rc);
-		return -1;
+	if (rc != EOK) {
+		printf("%s: Unable to register server\n", NAME);
+		return rc;
 	}
 	
@@ -671,7 +671,8 @@
 	
 	service_id_t service_id;
-	if (loc_service_register(kbd, &service_id) != EOK) {
+	rc = loc_service_register(kbd, &service_id);
+	if (rc != EOK) {
 		printf("%s: Unable to register service %s\n", NAME, kbd);
-		return -1;
+		return rc;
 	}
 	
Index: uspace/srv/hid/input/port/adb.c
===================================================================
--- uspace/srv/hid/input/port/adb.c	(revision 2f90b46749b0b0b689233324cb5f2489bd7b57a3)
+++ uspace/srv/hid/input/port/adb.c	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
@@ -65,12 +65,9 @@
 static int adb_port_init(kbd_dev_t *kdev)
 {
+	kbd_dev = kdev;
+	
 	const char *dev = "adb/kbd";
 	service_id_t service_id;
-	async_exch_t *exch;
-	int rc;
-	
-	kbd_dev = kdev;
-	
-	rc = loc_service_get_id(dev, &service_id, 0);
+	int rc = loc_service_get_id(dev, &service_id, 0);
 	if (rc != EOK)
 		return rc;
@@ -82,5 +79,5 @@
 	}
 	
-	exch = async_exchange_begin(dev_sess);
+	async_exch_t *exch = async_exchange_begin(dev_sess);
 	if (exch == NULL) {
 		printf("%s: Failed starting exchange with device\n", NAME);
@@ -89,5 +86,4 @@
 	}
 	
-	/* NB: The callback connection is slotted for removal */
 	rc = async_connect_to_me(exch, 0, 0, 0, kbd_port_events, NULL);
 	async_exchange_end(exch);
Index: uspace/srv/hid/input/proto/mousedev.c
===================================================================
--- uspace/srv/hid/input/proto/mousedev.c	(revision 2f90b46749b0b0b689233324cb5f2489bd7b57a3)
+++ uspace/srv/hid/input/proto/mousedev.c	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
@@ -117,5 +117,5 @@
 		printf("%s: Failed starting session with '%s'\n", NAME,
 		    mdev->svc_name);
-		return -1;
+		return ENOENT;
 	}
 	
@@ -125,5 +125,5 @@
 		    NAME, mdev->svc_name);
 		async_hangup(sess);
-		return -1;
+		return ENOMEM;
 	}
 	
@@ -134,5 +134,5 @@
 		mousedev_destroy(mousedev);
 		async_hangup(sess);
-		return -1;
+		return ENOENT;
 	}
 	
@@ -145,8 +145,8 @@
 		    NAME, mdev->svc_name);
 		mousedev_destroy(mousedev);
-		return -1;
+		return rc;
 	}
 	
-	return 0;
+	return EOK;
 }
 
Index: uspace/srv/hid/remcons/remcons.c
===================================================================
--- uspace/srv/hid/remcons/remcons.c	(revision 2f90b46749b0b0b689233324cb5f2489bd7b57a3)
+++ uspace/srv/hid/remcons/remcons.c	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
@@ -71,4 +71,5 @@
 	TELNET_IAC, TELNET_WONT, TELNET_LINEMODE
 };
+
 static const size_t telnet_force_character_mode_command_count =
     sizeof(telnet_force_character_mode_command) / sizeof(telnet_cmd_t);
@@ -272,8 +273,7 @@
 static int network_user_fibril(void *arg)
 {
-	int rc;
 	telnet_user_t *user = arg;
 
-	rc = loc_service_register(user->service_name, &user->service_id);
+	int rc = loc_service_register(user->service_name, &user->service_id);
 	if (rc != EOK) {
 		telnet_user_error(user, "Unable to register %s with loc: %s.",
@@ -284,9 +284,9 @@
 	telnet_user_log(user, "Service %s registerd with id %" PRIun ".",
 	    user->service_name, user->service_id);
-
+	
 	fid_t spawn_fibril = fibril_create(spawn_task_fibril, user);
 	assert(spawn_fibril);
 	fibril_add_ready(spawn_fibril);
-
+	
 	/* Wait for all clients to exit. */
 	fibril_mutex_lock(&user->guard);
@@ -304,5 +304,5 @@
 	}
 	fibril_mutex_unlock(&user->guard);
-
+	
 	rc = loc_service_unregister(user->service_id);
 	if (rc != EOK) {
@@ -324,15 +324,14 @@
 	async_set_client_connection(client_connection);
 	int rc = loc_server_register(NAME);
-	if (rc < 0) {
-		fprintf(stderr, NAME ": Unable to register server: %s.\n",
-		    str_error(rc));
-		return 1;
-	}
-
+	if (rc != EOK) {
+		fprintf(stderr, "%s: Unable to register server\n", NAME);
+		return rc;
+	}
+	
 	struct sockaddr_in addr;
-
+	
 	addr.sin_family = AF_INET;
 	addr.sin_port = htons(port);
-
+	
 	rc = inet_pton(AF_INET, "127.0.0.1", (void *)
 	    &addr.sin_addr.s_addr);
Index: uspace/srv/hid/remcons/telnet.h
===================================================================
--- uspace/srv/hid/remcons/telnet.h	(revision 2f90b46749b0b0b689233324cb5f2489bd7b57a3)
+++ uspace/srv/hid/remcons/telnet.h	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
@@ -57,5 +57,4 @@
 #define TELNET_LINEMODE 34
 
-
 #endif
 
Index: uspace/srv/hid/remcons/user.h
===================================================================
--- uspace/srv/hid/remcons/user.h	(revision 2f90b46749b0b0b689233324cb5f2489bd7b57a3)
+++ uspace/srv/hid/remcons/user.h	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
@@ -76,24 +76,26 @@
 } telnet_user_t;
 
-telnet_user_t *telnet_user_create(int socket);
-void telnet_user_destroy(telnet_user_t *user);
-telnet_user_t *telnet_user_get_for_client_connection(service_id_t id);
-bool telnet_user_is_zombie(telnet_user_t *user);
-void telnet_user_notify_client_disconnected(telnet_user_t *user);
-int telnet_user_get_next_keyboard_event(telnet_user_t *user, kbd_event_t *event);
-int telnet_user_send_data(telnet_user_t *user, uint8_t *data, size_t size);
-void telnet_user_update_cursor_x(telnet_user_t *user, int new_x);
+extern telnet_user_t *telnet_user_create(int);
+extern void telnet_user_destroy(telnet_user_t *);
+extern telnet_user_t *telnet_user_get_for_client_connection(service_id_t);
+extern bool telnet_user_is_zombie(telnet_user_t *);
+extern void telnet_user_notify_client_disconnected(telnet_user_t *);
+extern int telnet_user_get_next_keyboard_event(telnet_user_t *, kbd_event_t *);
+extern int telnet_user_send_data(telnet_user_t *, uint8_t *, size_t);
+extern void telnet_user_update_cursor_x(telnet_user_t *, int);
 
 /** Print informational message about connected user. */
 #ifdef CONFIG_DEBUG
 #define telnet_user_log(user, fmt, ...) \
-	printf(NAME " [console %d (%d)]: " fmt "\n", user->id, (int) user->service_id, ##__VA_ARGS__)
+	printf(NAME " [console %d (%d)]: " fmt "\n", \
+	    user->id, (int) user->service_id, ##__VA_ARGS__)
 #else
-#define telnet_user_log(user, fmt, ...) (void)0
+#define telnet_user_log(user, fmt, ...) ((void) 0)
 #endif
 
 /** Print error message associated with connected user. */
 #define telnet_user_error(user, fmt, ...) \
-	fprintf(stderr, NAME " [console %d (%d)]: ERROR: " fmt "\n", user->id, (int) user->service_id, ##__VA_ARGS__)
+	fprintf(stderr, NAME " [console %d (%d)]: ERROR: " fmt "\n", \
+	    user->id, (int) user->service_id, ##__VA_ARGS__)
 
 #endif
Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision 2f90b46749b0b0b689233324cb5f2489bd7b57a3)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision 3123d2a20f29173fb6bad68dd2992ef22dac47de)
@@ -84,13 +84,11 @@
 int main(int argc, char *argv[])
 {
-	int rc;
-
-	printf(NAME ": S3C24xx touchscreen driver\n");
+	printf("%s: S3C24xx touchscreen driver\n", NAME);
 	
 	async_set_client_connection(s3c24xx_ts_connection);
-	rc = loc_server_register(NAME);
-	if (rc < 0) {
-		printf(NAME ": Unable to register driver.\n");
-		return -1;
+	int rc = loc_server_register(NAME);
+	if (rc != EOK) {
+		printf("%s: Unable to register driver.\n", NAME);
+		return rc;
 	}