Rename isi drivers to isimodem

Be more consistent with directory naming

13 files changed, 26 insertions, 26 deletions

diff --git a/drivers/isimodem/call-barring.c b/drivers/isimodem/call-barring.c
index 82abca98..087f632a 100644
--- a/drivers/isimodem/call-barring.c
+++ b/drivers/isimodem/call-barring.c
@@ -94,7 +94,7 @@ static void isi_call_barring_remove(struct ofono_call_barring *barr)
 }
 
 static struct ofono_call_barring_driver driver = {
-	.name			= "isi",
+	.name			= "isimodem",
 	.probe			= isi_call_barring_probe,
 	.remove			= isi_call_barring_remove,
 	.set			= isi_set,
diff --git a/drivers/isimodem/call-forwarding.c b/drivers/isimodem/call-forwarding.c
index 39fe0ee0..a2df2093 100644
--- a/drivers/isimodem/call-forwarding.c
+++ b/drivers/isimodem/call-forwarding.c
@@ -110,7 +110,7 @@ static void isi_call_forwarding_remove(struct ofono_call_forwarding *cf)
 }
 
 static struct ofono_call_forwarding_driver driver = {
-	.name			= "isi",
+	.name			= "isimodem",
 	.probe			= isi_call_forwarding_probe,
 	.remove			= isi_call_forwarding_remove,
 	.activation		= isi_activation,
diff --git a/drivers/isimodem/call-meter.c b/drivers/isimodem/call-meter.c
index f6635334..e4e84ad3 100644
--- a/drivers/isimodem/call-meter.c
+++ b/drivers/isimodem/call-meter.c
@@ -116,7 +116,7 @@ static void isi_call_meter_remove(struct ofono_call_meter *cm)
 }
 
 static struct ofono_call_meter_driver driver = {
-	.name			= "isi",
+	.name			= "isimodem",
 	.probe			= isi_call_meter_probe,
 	.remove			= isi_call_meter_remove,
 	.call_meter_query	= isi_call_meter_query,
diff --git a/drivers/isimodem/call-settings.c b/drivers/isimodem/call-settings.c
index a80261a4..5c0b169f 100644
--- a/drivers/isimodem/call-settings.c
+++ b/drivers/isimodem/call-settings.c
@@ -115,7 +115,7 @@ static void isi_call_settings_remove(struct ofono_call_settings *cs)
 }
 
 static struct ofono_call_settings_driver driver = {
-	.name			= "isi",
+	.name			= "isimodem",
 	.probe			= isi_call_settings_probe,
 	.remove			= isi_call_settings_remove,
 	.clip_query		= isi_clip_query,
diff --git a/drivers/isimodem/devinfo.c b/drivers/isimodem/devinfo.c
index d7696762..618b9c35 100644
--- a/drivers/isimodem/devinfo.c
+++ b/drivers/isimodem/devinfo.c
@@ -405,7 +405,7 @@ static void isi_devinfo_remove(struct ofono_devinfo *info)
 }
 
 static struct ofono_devinfo_driver driver = {
-	.name			= "isi",
+	.name			= "isimodem",
 	.probe			= isi_devinfo_probe,
 	.remove			= isi_devinfo_remove,
 	.query_manufacturer	= isi_query_manufacturer,
diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c
index b681952a..3a98b123 100644
--- a/drivers/isimodem/isimodem.c
+++ b/drivers/isimodem/isimodem.c
@@ -98,7 +98,7 @@ static void netlink_status_cb(bool up, uint8_t addr, GIsiModem *idx,
 		sprintf(node, "isi%p", idx);
 
 		isi->idx = idx;
-		isi->modem = ofono_modem_create(node, "isi");
+		isi->modem = ofono_modem_create(node, "isimodem");
 
 		if (!isi->modem) {
 			g_free(isi);
@@ -148,22 +148,22 @@ static void isi_modem_populate(struct ofono_modem *modem)
 {
 	struct isi_data *isi = ofono_modem_get_data(modem);
 
-	ofono_devinfo_create(isi->modem, 0, "isi", isi->idx);
-	ofono_phonebook_create(isi->modem, 0, "isi", isi->idx);
-	ofono_netreg_create(isi->modem, 0, "isi", isi->idx);
-	ofono_voicecall_create(isi->modem, 0, "isi", isi->idx);
-	ofono_sms_create(isi->modem, 0, "isi", isi->idx);
-	ofono_sim_create(isi->modem, 0, "isi", isi->idx);
-	ofono_ssn_create(isi->modem, 0, "isi", isi->idx);
-	ofono_ussd_create(isi->modem, 0, "isi", isi->idx);
-	ofono_call_forwarding_create(isi->modem, 0, "isi", isi->idx);
-	ofono_call_settings_create(isi->modem, 0, "isi", isi->idx);
-	ofono_call_barring_create(isi->modem, 0, "isi", isi->idx);
-	ofono_call_meter_create(isi->modem, 0, "isi", isi->idx);
+	ofono_devinfo_create(isi->modem, 0, "isimodem", isi->idx);
+	ofono_phonebook_create(isi->modem, 0, "isimodem", isi->idx);
+	ofono_netreg_create(isi->modem, 0, "isimodem", isi->idx);
+	ofono_voicecall_create(isi->modem, 0, "isimodem", isi->idx);
+	ofono_sms_create(isi->modem, 0, "isimodem", isi->idx);
+	ofono_sim_create(isi->modem, 0, "isimodem", isi->idx);
+	ofono_ssn_create(isi->modem, 0, "isimodem", isi->idx);
+	ofono_ussd_create(isi->modem, 0, "isimodem", isi->idx);
+	ofono_call_forwarding_create(isi->modem, 0, "isimodem", isi->idx);
+	ofono_call_settings_create(isi->modem, 0, "isimodem", isi->idx);
+	ofono_call_barring_create(isi->modem, 0, "isimodem", isi->idx);
+	ofono_call_meter_create(isi->modem, 0, "isimodem", isi->idx);
 }
 
 static struct ofono_modem_driver driver = {
-	.name = "isi",
+	.name = "isimodem",
 	.probe = isi_modem_probe,
 	.remove = isi_modem_remove,
 	.enable = isi_modem_enable,
diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c
index 4bf6b02e..4a2e3b63 100644
--- a/drivers/isimodem/network-registration.c
+++ b/drivers/isimodem/network-registration.c
@@ -211,7 +211,7 @@ static void isi_netreg_remove(struct ofono_netreg *net)
 }
 
 static struct ofono_netreg_driver driver = {
-	.name			= "isi",
+	.name			= "isimodem",
 	.probe			= isi_netreg_probe,
 	.remove			= isi_netreg_remove,
 	.registration_status 	= isi_registration_status,
diff --git a/drivers/isimodem/phonebook.c b/drivers/isimodem/phonebook.c
index 93fb03f1..b500fdea 100644
--- a/drivers/isimodem/phonebook.c
+++ b/drivers/isimodem/phonebook.c
@@ -414,7 +414,7 @@ static void isi_phonebook_remove(struct ofono_phonebook *pb)
 }
 
 static struct ofono_phonebook_driver driver = {
-	.name			= "isi",
+	.name			= "isimodem",
 	.probe			= isi_phonebook_probe,
 	.remove			= isi_phonebook_remove,
 	.export_entries		= isi_export_entries
diff --git a/drivers/isimodem/sim.c b/drivers/isimodem/sim.c
index 32c1238c..ccb47452 100644
--- a/drivers/isimodem/sim.c
+++ b/drivers/isimodem/sim.c
@@ -125,7 +125,7 @@ static void isi_sim_remove(struct ofono_sim *sim)
 }
 
 static struct ofono_sim_driver driver = {
-	.name			= "isi",
+	.name			= "isimodem",
 	.probe			= isi_sim_probe,
 	.remove			= isi_sim_remove,
 	.read_file_info		= isi_read_file_info,
diff --git a/drivers/isimodem/sms.c b/drivers/isimodem/sms.c
index 69e8ab18..4321496e 100644
--- a/drivers/isimodem/sms.c
+++ b/drivers/isimodem/sms.c
@@ -94,7 +94,7 @@ static void isi_sms_remove(struct ofono_sms *sms)
 }
 
 static struct ofono_sms_driver driver = {
-	.name			= "isi",
+	.name			= "isimodem",
 	.probe			= isi_sms_probe,
 	.remove			= isi_sms_remove,
 	.sca_query		= isi_sca_query,
diff --git a/drivers/isimodem/ssn.c b/drivers/isimodem/ssn.c
index 51e932bf..10d7113e 100644
--- a/drivers/isimodem/ssn.c
+++ b/drivers/isimodem/ssn.c
@@ -77,7 +77,7 @@ static void isi_ssn_remove(struct ofono_ssn *ssn)
 }
 
 static struct ofono_ssn_driver driver = {
-	.name			= "isi",
+	.name			= "isimodem",
 	.probe			= isi_ssn_probe,
 	.remove			= isi_ssn_remove
 };
diff --git a/drivers/isimodem/ussd.c b/drivers/isimodem/ussd.c
index e240a90b..22a06a17 100644
--- a/drivers/isimodem/ussd.c
+++ b/drivers/isimodem/ussd.c
@@ -87,7 +87,7 @@ static void isi_ussd_remove(struct ofono_ussd *ussd)
 }
 
 static struct ofono_ussd_driver driver = {
-	.name			= "isi",
+	.name			= "isimodem",
 	.probe			= isi_ussd_probe,
 	.remove			= isi_ussd_remove,
 	.request		= isi_request,
diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index d724f341..bb24a801 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -156,7 +156,7 @@ static void isi_voicecall_remove(struct ofono_voicecall *call)
 }
 
 static struct ofono_voicecall_driver driver = {
-	.name			= "isi",
+	.name			= "isimodem",
 	.probe			= isi_voicecall_probe,
 	.remove			= isi_voicecall_remove,
 	.dial			= isi_dial,