sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Make remove functions not return anything

This commit is contained in:
Denis Kenzior 2009-09-01 22:27:08 -05:00
parent 422df0edfb
commit 9caa606bcc
39 changed files with 39 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/atmodem/call-barring.c
View File

@ -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 = {

3
drivers/atmodem/call-forwarding.c
View File

@ -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 = {

3
drivers/atmodem/call-meter.c
View File

@ -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 = {

3
drivers/atmodem/call-settings.c
View File

@ -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 = {

3
drivers/atmodem/devinfo.c
View File

@ -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 = {

4
drivers/atmodem/network-registration.c
View File

@ -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 = {

4
drivers/atmodem/phonebook.c
View File

@ -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 = {

3
drivers/atmodem/sim.c
View File

@ -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 = {

4
drivers/atmodem/sms.c
View File

@ -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 = {

3
drivers/atmodem/ssn.c
View File

@ -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 = {

3
drivers/atmodem/ussd.c
View File

@ -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 = {

4
drivers/atmodem/voicecall.c
View File

@ -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 = {

4
drivers/isimodem/call-barring.c
View File

@ -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 = {

4
drivers/isimodem/call-forwarding.c
View File

@ -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 = {

4
drivers/isimodem/call-meter.c
View File

@ -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 = {

4
drivers/isimodem/call-settings.c
View File

@ -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 = {

4
drivers/isimodem/devinfo.c
View File

@ -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 = {

3
drivers/isimodem/isimodem.c
View File

@ -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)

4
drivers/isimodem/network-registration.c
View File

@ -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 = {

4
drivers/isimodem/phonebook.c
View File

@ -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 = {

4
drivers/isimodem/sim.c
View File

@ -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 = {

4
drivers/isimodem/sms.c
View File

@ -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 = {

4
drivers/isimodem/ssn.c
View File

@ -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 = {

4
drivers/isimodem/ussd.c
View File

@ -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 = {

4
drivers/isimodem/voicecall.c
View File

@ -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 = {

2
include/call-barring.h
View File

@ -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);

2
include/call-forwarding.h
View File

@ -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);

2
include/call-meter.h
View File

@ -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,

2
include/call-settings.h
View File

@ -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,

2
include/devinfo.h
View File

@ -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,

2
include/modem.h
View File

@ -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);

2
include/netreg.h
View File

@ -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,

2
include/phonebook.h
View File

@ -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);
};

2
include/sim.h
View File

@ -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,

2
include/sms.h
View File

@ -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,

2
include/ssn.h
View File

@ -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). */

2
include/ussd.h
View File

@ -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,

2
include/voicecall.h
View File

@ -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,

4
plugins/generic_at.c
View File

@ -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)