diff --git a/src/call-barring.c b/src/call-barring.c
index 01301f9f..a88cc616 100644
--- a/src/call-barring.c
+++ b/src/call-barring.c
@@ -1197,7 +1197,7 @@ void ofono_call_barring_register(struct ofono_call_barring *cb)
 					ssn_watch, cb, NULL);
 
 	ssn_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SSN);
-	
+
 	if (ssn_atom && __ofono_atom_get_registered(ssn_atom))
 		ssn_watch(ssn_atom, OFONO_ATOM_WATCH_CONDITION_REGISTERED, cb);
 
diff --git a/src/call-forwarding.c b/src/call-forwarding.c
index fd2a91a3..649040fa 100644
--- a/src/call-forwarding.c
+++ b/src/call-forwarding.c
@@ -513,7 +513,7 @@ static void set_query_cf_callback(const struct ofono_error *error, int total,
 	if (cf->query_next == cf->query_end) {
 		reply = dbus_message_new_method_return(cf->pending);
 		__ofono_dbus_pending_reply(&cf->pending, reply);
-	} 
+	}
 
 	l = cf_cond_list_create(total, list);
 	set_new_cond_list(cf, cf->query_next, l);
diff --git a/src/call-meter.c b/src/call-meter.c
index 78c397a2..6030e547 100644
--- a/src/call-meter.c
+++ b/src/call-meter.c
@@ -254,7 +254,7 @@ static void query_acm_max(struct ofono_call_meter *cm)
 		cm->flags |= CALL_METER_FLAG_CACHED;
 
 		query_acm(cm);
-		return; 
+		return;
 	}
 
 	cm->driver->acm_max_query(cm, query_acm_max_callback, cm);
diff --git a/src/modem.c b/src/modem.c
index 209033f2..bbb7db17 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -200,10 +200,10 @@ int __ofono_modem_add_atom_watch(struct ofono_modem *modem,
 					void *data, ofono_destroy_func destroy)
 {
 	struct ofono_atom_watch *watch;
-	
+
 	if (notify == NULL)
 		return 0;
-		
+
 	watch = g_new0(struct ofono_atom_watch, 1);
 
 	watch->type = type;
diff --git a/src/network.c b/src/network.c
index 1f9a2fcd..fa8ca4f4 100644
--- a/src/network.c
+++ b/src/network.c
@@ -841,8 +841,8 @@ static gboolean update_network_operator_list_init(void *user_data)
 	struct ofono_modem *modem = user_data;
 
 	update_network_operator_list(modem);
-		
-	modem->network_registration->opscan_source = 
+
+	modem->network_registration->opscan_source =
 		g_timeout_add_seconds(OPERATOR_LIST_UPDATE_TIME,
 					update_network_operator_list_cb, modem);
 
@@ -946,7 +946,7 @@ static void initialize_network_registration(struct ofono_modem *modem)
 		network_sim_ready(modem);
 
 	if (netreg->ops->list_operators)
-		netreg->opscan_source = 
+		netreg->opscan_source =
 			g_timeout_add_seconds(5,
 				update_network_operator_list_init, modem);
 }
@@ -1044,9 +1044,8 @@ static void operator_list_callback(const struct ofono_error *error, int total,
 	if (netreg->operator_list)
 		need_to_emit = TRUE;
 
-	for (o = netreg->operator_list; o; o = o->next) {
+	for (o = netreg->operator_list; o; o = o->next)
 		network_operator_dbus_unregister(modem, o->data);
-	}
 
 	g_slist_free(netreg->operator_list);
 
diff --git a/src/ssn.c b/src/ssn.c
index 2bc047d3..dc5b3750 100644
--- a/src/ssn.c
+++ b/src/ssn.c
@@ -60,7 +60,7 @@ static unsigned int add_ssn_handler(GSList **l, unsigned int *id,
 
 	if (notify == NULL)
 		return 0;
-		
+
 	handler = g_new0(struct ssn_handler, 1);
 
 	handler->code = code;