12 files changed, 21 insertions, 15 deletions
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);