summaryrefslogtreecommitdiffstats
path: root/drivers/isimodem
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isimodem')
-rw-r--r--drivers/isimodem/call-barring.c4
-rw-r--r--drivers/isimodem/call-forwarding.c4
-rw-r--r--drivers/isimodem/call-meter.c4
-rw-r--r--drivers/isimodem/call-settings.c4
-rw-r--r--drivers/isimodem/devinfo.c4
-rw-r--r--drivers/isimodem/isimodem.c3
-rw-r--r--drivers/isimodem/network-registration.c4
-rw-r--r--drivers/isimodem/phonebook.c4
-rw-r--r--drivers/isimodem/sim.c4
-rw-r--r--drivers/isimodem/sms.c4
-rw-r--r--drivers/isimodem/ssn.c4
-rw-r--r--drivers/isimodem/ussd.c4
-rw-r--r--drivers/isimodem/voicecall.c4
13 files changed, 13 insertions, 38 deletions
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 = {