Index: uspace/srv/hw/netif/dp8390/dp8390_module.c
===================================================================
--- uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision 9fd39d673bc4186b3b529c4847750f207764ede4)
+++ uspace/srv/hw/netif/dp8390/dp8390_module.c	(revision 9ee9d5d54a138ef270bc4341d5469e7ed16f679e)
@@ -158,13 +158,14 @@
 
 int netif_get_device_stats(device_id_t device_id, device_stats_ref stats){
-	ERROR_DECLARE;
-
 	netif_device_t * device;
 	eth_stat_t * de_stat;
+	int rc;
 
 	if(! stats){
 		return EBADMEM;
 	}
-	ERROR_PROPAGATE(find_device(device_id, &device));
+	rc = find_device(device_id, &device);
+	if (rc != EOK)
+		return rc;
 	de_stat = &((dpeth_t *) device->specific)->de_stat;
 	null_device_stats(stats);
@@ -185,12 +186,13 @@
 
 int netif_get_addr_message(device_id_t device_id, measured_string_ref address){
-	ERROR_DECLARE;
-
-	netif_device_t * device;
+	netif_device_t * device;
+	int rc;
 
 	if(! address){
 		return EBADMEM;
 	}
-	ERROR_PROPAGATE(find_device(device_id, &device));
+	rc = find_device(device_id, &device);
+	if (rc != EOK)
+		return rc;
 	address->value = (char *) (&((dpeth_t *) device->specific)->de_address);
 	address->length = CONVERT_SIZE(ether_addr_t, char, 1);
@@ -201,8 +203,7 @@
 
 int netif_probe_message(device_id_t device_id, int irq, uintptr_t io){
-	ERROR_DECLARE;
-
-	netif_device_t * device;
-	dpeth_t * dep;
+	netif_device_t * device;
+	dpeth_t * dep;
+	int rc;
 
 	device = (netif_device_t *) malloc(sizeof(netif_device_t));
@@ -224,14 +225,21 @@
 	dep->de_mode = DEM_DISABLED;
 	//TODO address?
-	if(ERROR_OCCURRED(pio_enable((void *) io, DP8390_IO_SIZE, (void **) &dep->de_base_port))
-		|| ERROR_OCCURRED(do_probe(dep))){
+	rc = pio_enable((void *) io, DP8390_IO_SIZE, (void **) &dep->de_base_port);
+	if (rc != EOK) {
 		free(dep);
 		free(device);
-		return ERROR_CODE;
-	}
-	if(ERROR_OCCURRED(netif_device_map_add(&netif_globals.device_map, device->device_id, device))){
+		return rc;
+	}	
+	rc = do_probe(dep);
+	if (rc != EOK) {
 		free(dep);
 		free(device);
-		return ERROR_CODE;
+		return rc;
+	}
+	rc = netif_device_map_add(&netif_globals.device_map, device->device_id, device);
+	if (rc != EOK){
+		free(dep);
+		free(device);
+		return rc;
 	}
 	return EOK;
@@ -239,11 +247,12 @@
 
 int netif_send_message(device_id_t device_id, packet_t packet, services_t sender){
-	ERROR_DECLARE;
-
 	netif_device_t * device;
 	dpeth_t * dep;
 	packet_t next;
-
-	ERROR_PROPAGATE(find_device(device_id, &device));
+	int rc;
+
+	rc = find_device(device_id, &device);
+	if (rc != EOK)
+		return rc;
 	if(device->state != NETIF_ACTIVE){
 		netif_pq_release(packet_get_id(packet));
@@ -263,7 +272,6 @@
 
 int netif_start_message(netif_device_t * device){
-	ERROR_DECLARE;
-
-	dpeth_t * dep;
+	dpeth_t * dep;
+	int rc;
 
 	if(device->state != NETIF_ACTIVE){
@@ -271,8 +279,11 @@
 		dp8390_cmds[0].addr = (void *) (uintptr_t) (dep->de_dp8390_port + DP_ISR);
 		dp8390_cmds[2].addr = dp8390_cmds[0].addr;
-		ERROR_PROPAGATE(ipc_register_irq(dep->de_irq, device->device_id, device->device_id, &dp8390_code));
-		if(ERROR_OCCURRED(do_init(dep, DL_BROAD_REQ))){
+		rc = ipc_register_irq(dep->de_irq, device->device_id, device->device_id, &dp8390_code);
+		if (rc != EOK)
+			return rc;
+		rc = do_init(dep, DL_BROAD_REQ);
+		if (rc != EOK) {
 			ipc_unregister_irq(dep->de_irq, device->device_id);
-			return ERROR_CODE;
+			return rc;
 		}
 		return change_state(device, NETIF_ACTIVE);
@@ -350,11 +361,9 @@
 int main(int argc, char *argv[])
 {
-	ERROR_DECLARE;
+	int rc;
 	
 	/* Start the module */
-	if (ERROR_OCCURRED(netif_module_start(netif_client_connection)))
-		return ERROR_CODE;
-	
-	return EOK;
+	rc = netif_module_start(netif_client_connection);
+	return rc;
 }