Make remove functions not return anything

39 files changed, 39 insertions, 82 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 = {
diff --git a/drivers/isimodem/call-barring.c b/drivers/isimodem/call-barring.c
index 7474e0aa..82abca98 100644
--- a/drivers/isimodem/call-barring.c
+++ b/drivers/isimodem/call-barring.c
@@ -83,7 +83,7 @@ static int isi_call_barring_probe(struct ofono_call_barring *barr,
 	return 0;
 }
 
-static int isi_call_barring_remove(struct ofono_call_barring *barr)
+static void isi_call_barring_remove(struct ofono_call_barring *barr)
 {
 	struct call_barring_data *data = ofono_call_barring_get_data(barr);
 
@@ -91,8 +91,6 @@ static int isi_call_barring_remove(struct ofono_call_barring *barr)
 		g_isi_client_destroy(data->client);
 		g_free(data);
 	}
-
-	return 0;
 }
 
 static struct ofono_call_barring_driver driver = {
diff --git a/drivers/isimodem/call-forwarding.c b/drivers/isimodem/call-forwarding.c
index 68d1bb51..39fe0ee0 100644
--- a/drivers/isimodem/call-forwarding.c
+++ b/drivers/isimodem/call-forwarding.c
@@ -99,7 +99,7 @@ static int isi_call_forwarding_probe(struct ofono_call_forwarding *cf,
 	return 0;
 }
 
-static int isi_call_forwarding_remove(struct ofono_call_forwarding *cf)
+static void isi_call_forwarding_remove(struct ofono_call_forwarding *cf)
 {
 	struct call_forwarding_data *data = ofono_call_forwarding_get_data(cf);
 
@@ -107,8 +107,6 @@ static int isi_call_forwarding_remove(struct ofono_call_forwarding *cf)
 		g_isi_client_destroy(data->client);
 		g_free(data);
 	}
-
-	return 0;
 }
 
 static struct ofono_call_forwarding_driver driver = {
diff --git a/drivers/isimodem/call-meter.c b/drivers/isimodem/call-meter.c
index 8b932f6c..f6635334 100644
--- a/drivers/isimodem/call-meter.c
+++ b/drivers/isimodem/call-meter.c
@@ -105,7 +105,7 @@ static int isi_call_meter_probe(struct ofono_call_meter *cm,
 	return 0;
 }
 
-static int isi_call_meter_remove(struct ofono_call_meter *cm)
+static void isi_call_meter_remove(struct ofono_call_meter *cm)
 {
 	struct call_meter_data *data = ofono_call_meter_get_data(cm);
 
@@ -113,8 +113,6 @@ static int isi_call_meter_remove(struct ofono_call_meter *cm)
 		g_isi_client_destroy(data->client);
 		g_free(data);
 	}
-
-	return 0;
 }
 
 static struct ofono_call_meter_driver driver = {
diff --git a/drivers/isimodem/call-settings.c b/drivers/isimodem/call-settings.c
index 03316277..a80261a4 100644
--- a/drivers/isimodem/call-settings.c
+++ b/drivers/isimodem/call-settings.c
@@ -104,7 +104,7 @@ static int isi_call_settings_probe(struct ofono_call_settings *cs, unsigned int
 	return 0;
 }
 
-static int isi_call_settings_remove(struct ofono_call_settings *cs)
+static void isi_call_settings_remove(struct ofono_call_settings *cs)
 {
 	struct call_settings_data *data = ofono_call_settings_get_data(cs);
 
@@ -112,8 +112,6 @@ static int isi_call_settings_remove(struct ofono_call_settings *cs)
 		g_isi_client_destroy(data->client);
 		g_free(data);
 	}
-
-	return 0;
 }
 
 static struct ofono_call_settings_driver driver = {
diff --git a/drivers/isimodem/devinfo.c b/drivers/isimodem/devinfo.c
index 523aa4e0..d7696762 100644
--- a/drivers/isimodem/devinfo.c
+++ b/drivers/isimodem/devinfo.c
@@ -394,7 +394,7 @@ static int isi_devinfo_probe(struct ofono_devinfo *info, unsigned int vendor,
 	return 0;
 }
 
-static int isi_devinfo_remove(struct ofono_devinfo *info)
+static void isi_devinfo_remove(struct ofono_devinfo *info)
 {
 	struct devinfo_data *data = ofono_devinfo_get_data(info);
 
@@ -402,8 +402,6 @@ static int isi_devinfo_remove(struct ofono_devinfo *info)
 		g_isi_client_destroy(data->client);
 		g_free(data);
 	}
-
-	return 0;
 }
 
 static struct ofono_devinfo_driver driver = {
diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c
index d5000b11..1dc10b45 100644
--- a/drivers/isimodem/isimodem.c
+++ b/drivers/isimodem/isimodem.c
@@ -130,9 +130,8 @@ static int isi_modem_probe(struct ofono_modem *modem)
 	return 0;
 }
 
-static int isi_modem_remove(struct ofono_modem *modem)
+static void isi_modem_remove(struct ofono_modem *modem)
 {
-	return 0;
 }
 
 static int isi_modem_enable(struct ofono_modem *modem)
diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c
index 4442248a..4bf6b02e 100644
--- a/drivers/isimodem/network-registration.c
+++ b/drivers/isimodem/network-registration.c
@@ -200,7 +200,7 @@ static int isi_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
 	return 0;
 }
 
-static int isi_netreg_remove(struct ofono_netreg *net)
+static void isi_netreg_remove(struct ofono_netreg *net)
 {
 	struct netreg_data *data = ofono_netreg_get_data(net);
 
@@ -208,8 +208,6 @@ static int isi_netreg_remove(struct ofono_netreg *net)
 		g_isi_client_destroy(data->client);
 		g_free(data);
 	}
-
-	return 0;
 }
 
 static struct ofono_netreg_driver driver = {
diff --git a/drivers/isimodem/phonebook.c b/drivers/isimodem/phonebook.c
index b8011684..93fb03f1 100644
--- a/drivers/isimodem/phonebook.c
+++ b/drivers/isimodem/phonebook.c
@@ -403,7 +403,7 @@ static int isi_phonebook_probe(struct ofono_phonebook *pb, unsigned int vendor,
 	return 0;
 }
 
-static int isi_phonebook_remove(struct ofono_phonebook *pb)
+static void isi_phonebook_remove(struct ofono_phonebook *pb)
 {
 	struct pb_data *data = ofono_phonebook_get_data(pb);
 
@@ -411,8 +411,6 @@ static int isi_phonebook_remove(struct ofono_phonebook *pb)
 		g_isi_client_destroy(data->client);
 		g_free(data);
 	}
-
-	return 0;
 }
 
 static struct ofono_phonebook_driver driver = {
diff --git a/drivers/isimodem/sim.c b/drivers/isimodem/sim.c
index 1960e308..32c1238c 100644
--- a/drivers/isimodem/sim.c
+++ b/drivers/isimodem/sim.c
@@ -114,7 +114,7 @@ static int isi_sim_probe(struct ofono_sim *sim, unsigned int vendor,
 	return 0;
 }
 
-static int isi_sim_remove(struct ofono_sim *sim)
+static void isi_sim_remove(struct ofono_sim *sim)
 {
 	struct sim_data *data = ofono_sim_get_data(sim);
 
@@ -122,8 +122,6 @@ static int isi_sim_remove(struct ofono_sim *sim)
 		g_isi_client_destroy(data->client);
 		g_free(data);
 	}
-
-	return 0;
 }
 
 static struct ofono_sim_driver driver = {
diff --git a/drivers/isimodem/sms.c b/drivers/isimodem/sms.c
index 0303fc03..69e8ab18 100644
--- a/drivers/isimodem/sms.c
+++ b/drivers/isimodem/sms.c
@@ -83,7 +83,7 @@ static int isi_sms_probe(struct ofono_sms *sms, unsigned int vendor,
 	return 0;
 }
 
-static int isi_sms_remove(struct ofono_sms *sms)
+static void isi_sms_remove(struct ofono_sms *sms)
 {
 	struct sms_data *data = ofono_sms_get_data(sms);
 
@@ -91,8 +91,6 @@ static int isi_sms_remove(struct ofono_sms *sms)
 		g_isi_client_destroy(data->client);
 		g_free(data);
 	}
-
-	return 0;
 }
 
 static struct ofono_sms_driver driver = {
diff --git a/drivers/isimodem/ssn.c b/drivers/isimodem/ssn.c
index 5e3fbb26..51e932bf 100644
--- a/drivers/isimodem/ssn.c
+++ b/drivers/isimodem/ssn.c
@@ -66,7 +66,7 @@ static int isi_ssn_probe(struct ofono_ssn *ssn, unsigned int vendor,
 	return 0;
 }
 
-static int isi_ssn_remove(struct ofono_ssn *ssn)
+static void isi_ssn_remove(struct ofono_ssn *ssn)
 {
 	struct ssn_data *data = ofono_ssn_get_data(ssn);
 
@@ -74,8 +74,6 @@ static int isi_ssn_remove(struct ofono_ssn *ssn)
 		g_isi_client_destroy(data->client);
 		g_free(data);
 	}
-
-	return 0;
 }
 
 static struct ofono_ssn_driver driver = {
diff --git a/drivers/isimodem/ussd.c b/drivers/isimodem/ussd.c
index 7e80fec2..e240a90b 100644
--- a/drivers/isimodem/ussd.c
+++ b/drivers/isimodem/ussd.c
@@ -76,7 +76,7 @@ static int isi_ussd_probe(struct ofono_ussd *ussd, unsigned int vendor,
 	return 0;
 }
 
-static int isi_ussd_remove(struct ofono_ussd *ussd)
+static void isi_ussd_remove(struct ofono_ussd *ussd)
 {
 	struct ussd_data *data = ofono_ussd_get_data(ussd);
 
@@ -84,8 +84,6 @@ static int isi_ussd_remove(struct ofono_ussd *ussd)
 		g_isi_client_destroy(data->client);
 		g_free(data);
 	}
-
-	return 0;
 }
 
 static struct ofono_ussd_driver driver = {
diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index eefb2f40..d724f341 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -145,7 +145,7 @@ static int isi_voicecall_probe(struct ofono_voicecall *call,
 	return 0;
 }
 
-static int isi_voicecall_remove(struct ofono_voicecall *call)
+static void isi_voicecall_remove(struct ofono_voicecall *call)
 {
 	struct voicecall_data *data = ofono_voicecall_get_data(call);
 
@@ -153,8 +153,6 @@ static int isi_voicecall_remove(struct ofono_voicecall *call)
 		g_isi_client_destroy(data->client);
 		g_free(data);
 	}
-
-	return 0;
 }
 
 static struct ofono_voicecall_driver driver = {
diff --git a/include/call-barring.h b/include/call-barring.h
index e767d02c..31551c6c 100644
--- a/include/call-barring.h
+++ b/include/call-barring.h
@@ -39,7 +39,7 @@ struct ofono_call_barring_driver {
 	const char *name;
 	int (*probe)(struct ofono_call_barring *cb, unsigned int vendor,
 			void *data);
-	int (*remove)(struct ofono_call_barring *cb);
+	void (*remove)(struct ofono_call_barring *cb);
 	void (*set)(struct ofono_call_barring *barr, const char *lock,
 			int enable, const char *passwd, int cls,
 			ofono_call_barring_set_cb_t cb, void *data);
diff --git a/include/call-forwarding.h b/include/call-forwarding.h
index 05aa39d4..2a8a5fd9 100644
--- a/include/call-forwarding.h
+++ b/include/call-forwarding.h
@@ -49,7 +49,7 @@ struct ofono_call_forwarding_driver {
 	const char *name;
 	int (*probe)(struct ofono_call_forwarding *cf, unsigned int vendor,
 			void *data);
-	int (*remove)(struct ofono_call_forwarding *cf);
+	void (*remove)(struct ofono_call_forwarding *cf);
 	void (*activation)(struct ofono_call_forwarding *cf,
 				int type, int cls,
 				ofono_call_forwarding_set_cb_t cb, void *data);
diff --git a/include/call-meter.h b/include/call-meter.h
index a553c39b..c2aaddf5 100644
--- a/include/call-meter.h
+++ b/include/call-meter.h
@@ -44,7 +44,7 @@ struct ofono_call_meter_driver {
 	const char *name;
 	int (*probe)(struct ofono_call_meter *cm, unsigned int vendor,
 			void *data);
-	int (*remove)(struct ofono_call_meter *cm);
+	void (*remove)(struct ofono_call_meter *cm);
 	void (*call_meter_query)(struct ofono_call_meter *cm,
 			ofono_call_meter_query_cb_t cb, void *data);
 	void (*acm_query)(struct ofono_call_meter *cm,
diff --git a/include/call-settings.h b/include/call-settings.h
index 01e6d864..1fd3feb1 100644
--- a/include/call-settings.h
+++ b/include/call-settings.h
@@ -43,7 +43,7 @@ struct ofono_call_settings_driver {
 	const char *name;
 	int (*probe)(struct ofono_call_settings *cs, unsigned int vendor,
 			void *data);
-	int (*remove)(struct ofono_call_settings *cs);
+	void (*remove)(struct ofono_call_settings *cs);
 	void (*clip_query)(struct ofono_call_settings *cs,
 				ofono_call_settings_status_cb_t cb, void *data);
 	void (*colp_query)(struct ofono_call_settings *cs,
diff --git a/include/devinfo.h b/include/devinfo.h
index 7aa0f111..29f0c65f 100644
--- a/include/devinfo.h
+++ b/include/devinfo.h
@@ -37,7 +37,7 @@ struct ofono_devinfo_driver {
 	const char *name;
 	int (*probe)(struct ofono_devinfo *info, unsigned int vendor,
 			void *data);
-	int (*remove)(struct ofono_devinfo *info);
+	void (*remove)(struct ofono_devinfo *info);
 	void (*query_manufacturer)(struct ofono_devinfo *info,
 			ofono_devinfo_query_cb_t cb, void *data);
 	void (*query_serial)(struct ofono_devinfo *info,
diff --git a/include/modem.h b/include/modem.h
index f4843307..7f459956 100644
--- a/include/modem.h
+++ b/include/modem.h
@@ -56,7 +56,7 @@ struct ofono_modem_driver {
 	int (*probe)(struct ofono_modem *modem);
 
 	/* Destroy data structures allocated during probe and cleanup */
-	int (*remove)(struct ofono_modem *modem);
+	void (*remove)(struct ofono_modem *modem);
 
 	/* Power up device */
 	int (*enable)(struct ofono_modem *modem);
diff --git a/include/netreg.h b/include/netreg.h
index dbd63bc7..9e992001 100644
--- a/include/netreg.h
+++ b/include/netreg.h
@@ -72,7 +72,7 @@ struct ofono_netreg_driver {
 	const char *name;
 	int (*probe)(struct ofono_netreg *netreg, unsigned int vendor,
 			void *data);
-	int (*remove)(struct ofono_netreg *netreg);
+	void (*remove)(struct ofono_netreg *netreg);
 	void (*registration_status)(struct ofono_netreg *netreg,
 			ofono_netreg_status_cb_t cb, void *data);
 	void (*current_operator)(struct ofono_netreg *netreg,
diff --git a/include/phonebook.h b/include/phonebook.h
index 73f2bb9a..72134e0b 100644
--- a/include/phonebook.h
+++ b/include/phonebook.h
@@ -40,7 +40,7 @@ struct ofono_phonebook_driver {
 	const char *name;
 	int (*probe)(struct ofono_phonebook *pb, unsigned int vendor,
 			void *data);
-	int (*remove)(struct ofono_phonebook *pb);
+	void (*remove)(struct ofono_phonebook *pb);
 	void (*export_entries)(struct ofono_phonebook *pb, const char *storage,
 				ofono_phonebook_cb_t cb, void *data);
 };
diff --git a/include/sim.h b/include/sim.h
index 9ab60845..1da486c7 100644
--- a/include/sim.h
+++ b/include/sim.h
@@ -67,7 +67,7 @@ typedef void (*ofono_sim_file_write_cb_t)(int ok, void *userdata);
 struct ofono_sim_driver {
 	const char *name;
 	int (*probe)(struct ofono_sim *sim, unsigned int vendor, void *data);
-	int (*remove)(struct ofono_sim *sim);
+	void (*remove)(struct ofono_sim *sim);
 	void (*read_file_info)(struct ofono_sim *sim, int fileid,
 			ofono_sim_file_info_cb_t cb, void *data);
 	void (*read_file_transparent)(struct ofono_sim *sim, int fileid,
diff --git a/include/sms.h b/include/sms.h
index 35025f15..01ce667f 100644
--- a/include/sms.h
+++ b/include/sms.h
@@ -41,7 +41,7 @@ typedef void (*ofono_sms_sca_set_cb_t)(const struct ofono_error *error,
 struct ofono_sms_driver {
 	const char *name;
 	int (*probe)(struct ofono_sms *sms, unsigned int vendor, void *data);
-	int (*remove)(struct ofono_sms *sms);
+	void (*remove)(struct ofono_sms *sms);
 	void (*sca_query)(struct ofono_sms *sms, ofono_sms_sca_query_cb_t cb,
 				void *data);
 	void (*sca_set)(struct ofono_sms *sms,
diff --git a/include/ssn.h b/include/ssn.h
index c5e428c5..dc7f320d 100644
--- a/include/ssn.h
+++ b/include/ssn.h
@@ -33,7 +33,7 @@ struct ofono_ssn;
 struct ofono_ssn_driver {
 	const char *name;
 	int (*probe)(struct ofono_ssn *ssn, unsigned int vendor, void *data);
-	int (*remove)(struct ofono_ssn *ssn);
+	void (*remove)(struct ofono_ssn *ssn);
 };
 
 /* SSN notifications (CSSI and CSSU).  */
diff --git a/include/ussd.h b/include/ussd.h
index 6f5acdad..e39e3c76 100644
--- a/include/ussd.h
+++ b/include/ussd.h
@@ -35,7 +35,7 @@ typedef void (*ofono_ussd_cb_t)(const struct ofono_error *error, void *data);
 struct ofono_ussd_driver {
 	const char *name;
 	int (*probe)(struct ofono_ussd *ussd, unsigned int vendor, void *data);
-	int (*remove)(struct ofono_ussd *ussd);
+	void (*remove)(struct ofono_ussd *ussd);
 	void (*request)(struct ofono_ussd *ussd, const char *str,
 				ofono_ussd_cb_t, void *data);
 	void (*cancel)(struct ofono_ussd *ussd,
diff --git a/include/voicecall.h b/include/voicecall.h
index b19a0fd5..ac893135 100644
--- a/include/voicecall.h
+++ b/include/voicecall.h
@@ -48,7 +48,7 @@ struct ofono_voicecall_driver {
 	const char *name;
 	int (*probe)(struct ofono_voicecall *vc, unsigned int vendor,
 			void *data);
-	int (*remove)(struct ofono_voicecall *vc);
+	void (*remove)(struct ofono_voicecall *vc);
 	void (*dial)(struct ofono_voicecall *vc,
 			const struct ofono_phone_number *number,
 			enum ofono_clir_option clir, enum ofono_cug_option cug,
diff --git a/plugins/generic_at.c b/plugins/generic_at.c
index d3e4f6a0..3ba39156 100644
--- a/plugins/generic_at.c
+++ b/plugins/generic_at.c
@@ -416,13 +416,11 @@ static int generic_at_probe(struct ofono_modem *modem)
 	return 0;
 }
 
-static int generic_at_remove(struct ofono_modem *modem)
+static void generic_at_remove(struct ofono_modem *modem)
 {
 	struct generic_at_data *d = ofono_modem_get_data(modem);
 
 	generic_at_data_free(d);
-
-	return 0;
 }
 
 static int generic_at_enable(struct ofono_modem *modem)