summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/atmodem/call-barring.c4
-rw-r--r--drivers/atmodem/call-forwarding.c2
-rw-r--r--drivers/atmodem/call-meter.c3
-rw-r--r--drivers/atmodem/call-settings.c4
-rw-r--r--drivers/atmodem/devinfo.c3
-rw-r--r--drivers/atmodem/network-registration.c3
-rw-r--r--drivers/atmodem/phonebook.c2
-rw-r--r--drivers/atmodem/sim.c3
-rw-r--r--drivers/atmodem/sms.c5
-rw-r--r--drivers/atmodem/ssn.c3
-rw-r--r--drivers/atmodem/ussd.c3
-rw-r--r--drivers/atmodem/voicecall.c2
-rw-r--r--drivers/isimodem/call-barring.c4
-rw-r--r--drivers/isimodem/call-forwarding.c2
-rw-r--r--drivers/isimodem/call-meter.c4
-rw-r--r--drivers/isimodem/call-settings.c2
-rw-r--r--drivers/isimodem/devinfo.c3
-rw-r--r--drivers/isimodem/network-registration.c3
-rw-r--r--drivers/isimodem/phonebook.c2
-rw-r--r--drivers/isimodem/sim.c3
-rw-r--r--drivers/isimodem/sms.c3
-rw-r--r--drivers/isimodem/ssn.c3
-rw-r--r--drivers/isimodem/ussd.c3
-rw-r--r--drivers/isimodem/voicecall.c4
24 files changed, 43 insertions, 30 deletions
diff --git a/drivers/atmodem/call-barring.c b/drivers/atmodem/call-barring.c
index 1009f0bd..f5d6ed7f 100644
--- a/drivers/atmodem/call-barring.c
+++ b/drivers/atmodem/call-barring.c
@@ -206,8 +206,8 @@ static gboolean at_call_barring_register(gpointer user)
return FALSE;
}
-static int at_call_barring_probe(struct ofono_call_barring *cb, int vendor,
- void *user)
+static int at_call_barring_probe(struct ofono_call_barring *cb,
+ unsigned int vendor, void *user)
{
GAtChat *chat = user;
diff --git a/drivers/atmodem/call-forwarding.c b/drivers/atmodem/call-forwarding.c
index 24fd8332..7fb5fb1f 100644
--- a/drivers/atmodem/call-forwarding.c
+++ b/drivers/atmodem/call-forwarding.c
@@ -262,7 +262,7 @@ static gboolean at_ccfc_register(gpointer user)
return FALSE;
}
-static int at_ccfc_probe(struct ofono_call_forwarding *cf, int vendor,
+static int at_ccfc_probe(struct ofono_call_forwarding *cf, unsigned int vendor,
void *data)
{
GAtChat *chat = data;
diff --git a/drivers/atmodem/call-meter.c b/drivers/atmodem/call-meter.c
index 2b68d058..ef86c6de 100644
--- a/drivers/atmodem/call-meter.c
+++ b/drivers/atmodem/call-meter.c
@@ -365,7 +365,8 @@ static void at_call_meter_initialized(gboolean ok, GAtResult *result,
ofono_call_meter_register(cm);
}
-static int at_caoc_probe(struct ofono_call_meter *cm, int vendor, void *data)
+static int at_caoc_probe(struct ofono_call_meter *cm, unsigned int vendor,
+ void *data)
{
GAtChat *chat = data;
diff --git a/drivers/atmodem/call-settings.c b/drivers/atmodem/call-settings.c
index d540ec16..a41023d7 100644
--- a/drivers/atmodem/call-settings.c
+++ b/drivers/atmodem/call-settings.c
@@ -365,8 +365,8 @@ static gboolean at_call_settings_register(gpointer user)
return FALSE;
}
-static int at_call_settings_probe(struct ofono_call_settings *cs, int vendor,
- void *data)
+static int at_call_settings_probe(struct ofono_call_settings *cs,
+ unsigned int vendor, void *data)
{
GAtChat *chat = data;
diff --git a/drivers/atmodem/devinfo.c b/drivers/atmodem/devinfo.c
index 8e3123af..66a62353 100644
--- a/drivers/atmodem/devinfo.c
+++ b/drivers/atmodem/devinfo.c
@@ -189,7 +189,8 @@ static gboolean at_devinfo_register(gpointer user_data)
return FALSE;
}
-static int at_devinfo_probe(struct ofono_devinfo *info, int vendor, void *data)
+static int at_devinfo_probe(struct ofono_devinfo *info, unsigned int vendor,
+ void *data)
{
GAtChat *chat = data;
diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c
index 79c59a08..8a42854a 100644
--- a/drivers/atmodem/network-registration.c
+++ b/drivers/atmodem/network-registration.c
@@ -636,7 +636,8 @@ static void at_network_registration_initialized(gboolean ok, GAtResult *result,
ofono_netreg_register(netreg);
}
-static int at_netreg_probe(struct ofono_netreg *netreg, int vendor, void *data)
+static int at_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
+ void *data)
{
GAtChat *chat = data;
struct netreg_data *nd;
diff --git a/drivers/atmodem/phonebook.c b/drivers/atmodem/phonebook.c
index f4d3ef1a..12c31b3c 100644
--- a/drivers/atmodem/phonebook.c
+++ b/drivers/atmodem/phonebook.c
@@ -518,7 +518,7 @@ static void at_list_charsets(struct ofono_phonebook *pb)
phonebook_not_supported(pb);
}
-static int at_phonebook_probe(struct ofono_phonebook *pb, int vendor,
+static int at_phonebook_probe(struct ofono_phonebook *pb, unsigned int vendor,
void *data)
{
GAtChat *chat = data;
diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
index 9f4577d9..8779ea71 100644
--- a/drivers/atmodem/sim.c
+++ b/drivers/atmodem/sim.c
@@ -440,7 +440,8 @@ static gboolean at_sim_register(gpointer user)
return FALSE;
}
-static int at_sim_probe(struct ofono_sim *sim, int vendor, void *data)
+static int at_sim_probe(struct ofono_sim *sim, unsigned int vendor,
+ void *data)
{
GAtChat *chat = data;
diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c
index 3ce104f4..d007c63e 100644
--- a/drivers/atmodem/sms.c
+++ b/drivers/atmodem/sms.c
@@ -73,7 +73,7 @@ struct sms_data {
char *cnma_ack_pdu;
int cnma_ack_pdu_len;
GAtChat *chat;
- int vendor;
+ unsigned int vendor;
};
struct cpms_request {
@@ -957,7 +957,8 @@ out:
at_csms_set_cb, sms, NULL);
}
-static int at_sms_probe(struct ofono_sms *sms, int vendor, void *user)
+static int at_sms_probe(struct ofono_sms *sms, unsigned int vendor,
+ void *user)
{
GAtChat *chat = user;
struct sms_data *data;
diff --git a/drivers/atmodem/ssn.c b/drivers/atmodem/ssn.c
index 7c7e86ea..78078ebe 100644
--- a/drivers/atmodem/ssn.c
+++ b/drivers/atmodem/ssn.c
@@ -111,7 +111,8 @@ static gboolean at_ssn_register(gpointer user)
return FALSE;
}
-static int at_ssn_probe(struct ofono_ssn *ssn, int vendor, void *data)
+static int at_ssn_probe(struct ofono_ssn *ssn, unsigned int vendor,
+ void *data)
{
GAtChat *chat = data;
diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c
index 3f454b16..a390f4f5 100644
--- a/drivers/atmodem/ussd.c
+++ b/drivers/atmodem/ussd.c
@@ -143,7 +143,8 @@ static gboolean at_ussd_register(gpointer user)
return FALSE;
}
-static int at_ussd_probe(struct ofono_ussd *ussd, int vendor, void *data)
+static int at_ussd_probe(struct ofono_ussd *ussd, unsigned int vendor,
+ void *data)
{
GAtChat *chat = data;
diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index 9b115a5e..70f42d90 100644
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -983,7 +983,7 @@ static void at_voicecall_initialized(gboolean ok, GAtResult *result,
ofono_voicecall_register(vc);
}
-static int at_voicecall_probe(struct ofono_voicecall *vc, int vendor,
+static int at_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
void *data)
{
GAtChat *chat = data;
diff --git a/drivers/isimodem/call-barring.c b/drivers/isimodem/call-barring.c
index d091930c..7474e0aa 100644
--- a/drivers/isimodem/call-barring.c
+++ b/drivers/isimodem/call-barring.c
@@ -65,8 +65,8 @@ static void isi_set_passwd(struct ofono_call_barring *barr, const char *lock,
{
}
-static int isi_call_barring_probe(struct ofono_call_barring *barr, int vendor,
- void *user)
+static int isi_call_barring_probe(struct ofono_call_barring *barr,
+ unsigned int vendor, void *user)
{
GIsiModem *idx = user;
struct call_barring_data *data = g_try_new0(struct call_barring_data, 1);
diff --git a/drivers/isimodem/call-forwarding.c b/drivers/isimodem/call-forwarding.c
index ce5e40f0..68d1bb51 100644
--- a/drivers/isimodem/call-forwarding.c
+++ b/drivers/isimodem/call-forwarding.c
@@ -80,7 +80,7 @@ static void isi_query(struct ofono_call_forwarding *cf, int type, int cls,
}
static int isi_call_forwarding_probe(struct ofono_call_forwarding *cf,
- int vendor, void *user)
+ unsigned int vendor, void *user)
{
GIsiModem *idx = user;
struct call_forwarding_data *data;
diff --git a/drivers/isimodem/call-meter.c b/drivers/isimodem/call-meter.c
index 712b98ee..8b932f6c 100644
--- a/drivers/isimodem/call-meter.c
+++ b/drivers/isimodem/call-meter.c
@@ -87,8 +87,8 @@ static void isi_puct_set(struct ofono_call_meter *cm, const char *currency,
{
}
-static int isi_call_meter_probe(struct ofono_call_meter *cm, int vendor,
- void *user)
+static int isi_call_meter_probe(struct ofono_call_meter *cm,
+ unsigned int vendor, void *user)
{
GIsiModem *idx = user;
struct call_meter_data *data = g_try_new0(struct call_meter_data, 1);
diff --git a/drivers/isimodem/call-settings.c b/drivers/isimodem/call-settings.c
index f564f0e8..03316277 100644
--- a/drivers/isimodem/call-settings.c
+++ b/drivers/isimodem/call-settings.c
@@ -83,7 +83,7 @@ static void isi_cw_set(struct ofono_call_settings *cs, int mode, int cls,
{
}
-static int isi_call_settings_probe(struct ofono_call_settings *cs, int vendor,
+static int isi_call_settings_probe(struct ofono_call_settings *cs, unsigned int vendor,
void *user)
{
GIsiModem *idx = user;
diff --git a/drivers/isimodem/devinfo.c b/drivers/isimodem/devinfo.c
index 7e503780..523aa4e0 100644
--- a/drivers/isimodem/devinfo.c
+++ b/drivers/isimodem/devinfo.c
@@ -370,7 +370,8 @@ static gboolean isi_devinfo_register(gpointer user)
return FALSE;
}
-static int isi_devinfo_probe(struct ofono_devinfo *info, int vendor, void *user)
+static int isi_devinfo_probe(struct ofono_devinfo *info, unsigned int vendor,
+ void *user)
{
GIsiModem *idx = user;
struct devinfo_data *data = g_try_new0(struct devinfo_data, 1);
diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c
index e00994bf..4442248a 100644
--- a/drivers/isimodem/network-registration.c
+++ b/drivers/isimodem/network-registration.c
@@ -178,7 +178,8 @@ static gboolean isi_netreg_register(gpointer user)
return FALSE;
}
-static int isi_netreg_probe(struct ofono_netreg *netreg, int vendor, void *user)
+static int isi_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
+ void *user)
{
GIsiModem *idx = user;
struct netreg_data *data = g_try_new0(struct netreg_data, 1);
diff --git a/drivers/isimodem/phonebook.c b/drivers/isimodem/phonebook.c
index f683638c..b8011684 100644
--- a/drivers/isimodem/phonebook.c
+++ b/drivers/isimodem/phonebook.c
@@ -376,7 +376,7 @@ static gboolean isi_phonebook_register(gpointer user)
return FALSE;
}
-static int isi_phonebook_probe(struct ofono_phonebook *pb, int vendor,
+static int isi_phonebook_probe(struct ofono_phonebook *pb, unsigned int vendor,
void *user)
{
GIsiModem *idx = user;
diff --git a/drivers/isimodem/sim.c b/drivers/isimodem/sim.c
index 1537ccf5..1960e308 100644
--- a/drivers/isimodem/sim.c
+++ b/drivers/isimodem/sim.c
@@ -96,7 +96,8 @@ static void isi_read_imsi(struct ofono_sim *sim,
{
}
-static int isi_sim_probe(struct ofono_sim *sim, int vendor, void *user)
+static int isi_sim_probe(struct ofono_sim *sim, unsigned int vendor,
+ void *user)
{
GIsiModem *idx = user;
struct sim_data *data = g_try_new0(struct sim_data, 1);
diff --git a/drivers/isimodem/sms.c b/drivers/isimodem/sms.c
index 36cbdae0..0303fc03 100644
--- a/drivers/isimodem/sms.c
+++ b/drivers/isimodem/sms.c
@@ -65,7 +65,8 @@ static void isi_submit(struct ofono_sms *sms, unsigned char *pdu,
{
}
-static int isi_sms_probe(struct ofono_sms *sms, int vendor, void *user)
+static int isi_sms_probe(struct ofono_sms *sms, unsigned int vendor,
+ void *user)
{
GIsiModem *idx = user;
struct sms_data *data = g_try_new0(struct sms_data, 1);
diff --git a/drivers/isimodem/ssn.c b/drivers/isimodem/ssn.c
index a5539fbe..5e3fbb26 100644
--- a/drivers/isimodem/ssn.c
+++ b/drivers/isimodem/ssn.c
@@ -48,7 +48,8 @@ struct ssn_data {
struct isi_version version;
};
-static int isi_ssn_probe(struct ofono_ssn *ssn, int vendor, void *user)
+static int isi_ssn_probe(struct ofono_ssn *ssn, unsigned int vendor,
+ void *user)
{
GIsiModem *idx = user;
struct ssn_data *data = g_try_new0(struct ssn_data, 1);
diff --git a/drivers/isimodem/ussd.c b/drivers/isimodem/ussd.c
index 4ba70fc1..7e80fec2 100644
--- a/drivers/isimodem/ussd.c
+++ b/drivers/isimodem/ussd.c
@@ -58,7 +58,8 @@ static void isi_cancel(struct ofono_ussd *ussd,
{
}
-static int isi_ussd_probe(struct ofono_ussd *ussd, int vendor, void *user)
+static int isi_ussd_probe(struct ofono_ussd *ussd, unsigned int vendor,
+ void *user)
{
GIsiModem *idx = user;
struct ussd_data *data = g_try_new0(struct ussd_data, 1);
diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index b1cee1c8..eefb2f40 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -127,8 +127,8 @@ static void isi_send_tones(struct ofono_voicecall *vc, const char *tones,
{
}
-static int isi_voicecall_probe(struct ofono_voicecall *call, int vendor,
- void *user)
+static int isi_voicecall_probe(struct ofono_voicecall *call,
+ unsigned int vendor, void *user)
{
GIsiModem *idx = user;
struct voicecall_data *data = g_try_new0(struct voicecall_data, 1);