12 files changed, 12 insertions, 28 deletions
diff --git a/drivers/atmodem/call-barring.c b/drivers/atmodem/call-barring.c
index f5d6ed7f..b161b88e 100644
--- a/drivers/atmodem/call-barring.c
+++ b/drivers/atmodem/call-barring.c
@@ -217,9 +217,8 @@ static int at_call_barring_probe(struct ofono_call_barring *cb,
 	return 0;
 }
 
-static int at_call_barring_remove(struct ofono_call_barring *cb)
+static void at_call_barring_remove(struct ofono_call_barring *cb)
 {
-	return 0;
 }
 
 static struct ofono_call_barring_driver driver = {
diff --git a/drivers/atmodem/call-forwarding.c b/drivers/atmodem/call-forwarding.c
index 7fb5fb1f..0277caab 100644
--- a/drivers/atmodem/call-forwarding.c
+++ b/drivers/atmodem/call-forwarding.c
@@ -273,9 +273,8 @@ static int at_ccfc_probe(struct ofono_call_forwarding *cf, unsigned int vendor,
 	return 0;
 }
 
-static int at_ccfc_remove(struct ofono_call_forwarding *cf)
+static void at_ccfc_remove(struct ofono_call_forwarding *cf)
 {
-	return 0;
 }
 
 static struct ofono_call_forwarding_driver driver = {
diff --git a/drivers/atmodem/call-meter.c b/drivers/atmodem/call-meter.c
index ef86c6de..903ac608 100644
--- a/drivers/atmodem/call-meter.c
+++ b/drivers/atmodem/call-meter.c
@@ -379,9 +379,8 @@ static int at_caoc_probe(struct ofono_call_meter *cm, unsigned int vendor,
 	return 0;
 }
 
-static int at_caoc_remove(struct ofono_call_meter *cm)
+static void at_caoc_remove(struct ofono_call_meter *cm)
 {
-	return 0;
 }
 
 static struct ofono_call_meter_driver driver = {
diff --git a/drivers/atmodem/call-settings.c b/drivers/atmodem/call-settings.c
index a41023d7..21566c8a 100644
--- a/drivers/atmodem/call-settings.c
+++ b/drivers/atmodem/call-settings.c
@@ -376,9 +376,8 @@ static int at_call_settings_probe(struct ofono_call_settings *cs,
 	return 0;
 }
 
-static int at_call_settings_remove(struct ofono_call_settings *cs)
+static void at_call_settings_remove(struct ofono_call_settings *cs)
 {
-	return 0;
 }
 
 static struct ofono_call_settings_driver driver = {
diff --git a/drivers/atmodem/devinfo.c b/drivers/atmodem/devinfo.c
index 66a62353..97d969a4 100644
--- a/drivers/atmodem/devinfo.c
+++ b/drivers/atmodem/devinfo.c
@@ -200,9 +200,8 @@ static int at_devinfo_probe(struct ofono_devinfo *info, unsigned int vendor,
 	return 0;
 }
 
-static int at_devinfo_remove(struct ofono_devinfo *info)
+static void at_devinfo_remove(struct ofono_devinfo *info)
 {
-	return 0;
 }
 
 static struct ofono_devinfo_driver driver = {
diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c
index 8a42854a..a7752720 100644
--- a/drivers/atmodem/network-registration.c
+++ b/drivers/atmodem/network-registration.c
@@ -653,13 +653,11 @@ static int at_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
 	return 0;
 }
 
-static int at_netreg_remove(struct ofono_netreg *netreg)
+static void at_netreg_remove(struct ofono_netreg *netreg)
 {
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
 
 	g_free(nd);
-
-	return 0;
 }
 
 static struct ofono_netreg_driver driver = {
diff --git a/drivers/atmodem/phonebook.c b/drivers/atmodem/phonebook.c
index 12c31b3c..20918af6 100644
--- a/drivers/atmodem/phonebook.c
+++ b/drivers/atmodem/phonebook.c
@@ -534,7 +534,7 @@ static int at_phonebook_probe(struct ofono_phonebook *pb, unsigned int vendor,
 	return 0;
 }
 
-static int at_phonebook_remove(struct ofono_phonebook *pb)
+static void at_phonebook_remove(struct ofono_phonebook *pb)
 {
 	struct pb_data *pbd = ofono_phonebook_get_data(pb);
 
@@ -542,8 +542,6 @@ static int at_phonebook_remove(struct ofono_phonebook *pb)
 		g_free(pbd->old_charset);
 
 	g_free(pbd);
-
-	return 0;
 }
 
 static struct ofono_phonebook_driver driver = {
diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
index 8779ea71..0bfcec3f 100644
--- a/drivers/atmodem/sim.c
+++ b/drivers/atmodem/sim.c
@@ -451,9 +451,8 @@ static int at_sim_probe(struct ofono_sim *sim, unsigned int vendor,
 	return 0;
 }
 
-static int at_sim_remove(struct ofono_sim *sim)
+static void at_sim_remove(struct ofono_sim *sim)
 {
-	return 0;
 }
 
 static struct ofono_sim_driver driver = {
diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c
index d007c63e..61f7aa7d 100644
--- a/drivers/atmodem/sms.c
+++ b/drivers/atmodem/sms.c
@@ -975,7 +975,7 @@ static int at_sms_probe(struct ofono_sms *sms, unsigned int vendor,
 	return 0;
 }
 
-static int at_sms_remove(struct ofono_sms *sms)
+static void at_sms_remove(struct ofono_sms *sms)
 {
 	struct sms_data *data = ofono_sms_get_data(sms);
 
@@ -983,8 +983,6 @@ static int at_sms_remove(struct ofono_sms *sms)
 		g_free(data->cnma_ack_pdu);
 
 	g_free(data);
-
-	return 0;
 }
 
 static struct ofono_sms_driver driver = {
diff --git a/drivers/atmodem/ssn.c b/drivers/atmodem/ssn.c
index 78078ebe..533760d4 100644
--- a/drivers/atmodem/ssn.c
+++ b/drivers/atmodem/ssn.c
@@ -122,9 +122,8 @@ static int at_ssn_probe(struct ofono_ssn *ssn, unsigned int vendor,
 	return 0;
 }
 
-static int at_ssn_remove(struct ofono_ssn *ssn)
+static void at_ssn_remove(struct ofono_ssn *ssn)
 {
-	return 0;
 }
 
 static struct ofono_ssn_driver driver = {
diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c
index a390f4f5..ba39c00e 100644
--- a/drivers/atmodem/ussd.c
+++ b/drivers/atmodem/ussd.c
@@ -154,9 +154,8 @@ static int at_ussd_probe(struct ofono_ussd *ussd, unsigned int vendor,
 	return 0;
 }
 
-static int at_ussd_remove(struct ofono_ussd *ussd)
+static void at_ussd_remove(struct ofono_ussd *ussd)
 {
-	return 0;
 }
 
 static struct ofono_ussd_driver driver = {
diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index 70f42d90..45e0de1b 100644
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -1003,15 +1003,13 @@ static int at_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
 	return 0;
 }
 
-static int at_voicecall_remove(struct ofono_voicecall *vc)
+static void at_voicecall_remove(struct ofono_voicecall *vc)
 {
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 
 	g_slist_foreach(vd->calls, (GFunc) g_free, NULL);
 	g_slist_free(vd->calls);
 	g_free(vd);
-
-	return 0;
 }
 
 static struct ofono_voicecall_driver driver = {