summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2009-09-01 22:29:02 -0500
committerDenis Kenzior <denkenz@gmail.com>2009-09-01 22:29:02 -0500
commit7ff85d9737b030c3cda6797744b7e250f2b789c6 (patch)
treed736a68374873f7ef11d664498a73ca44d7a2ce9
parent9caa606bcc350389d31ac51b7728729aa52603ed (diff)
downloadofono-7ff85d9737b030c3cda6797744b7e250f2b789c6.tar.bz2
populate should return void
-rw-r--r--drivers/isimodem/isimodem.c4
-rw-r--r--include/modem.h2
-rw-r--r--plugins/generic_at.c4
3 files changed, 3 insertions, 7 deletions
diff --git a/drivers/isimodem/isimodem.c b/drivers/isimodem/isimodem.c
index 1dc10b45..b681952a 100644
--- a/drivers/isimodem/isimodem.c
+++ b/drivers/isimodem/isimodem.c
@@ -144,7 +144,7 @@ static int isi_modem_disable(struct ofono_modem *modem)
return 0;
}
-static int isi_modem_populate(struct ofono_modem *modem)
+static void isi_modem_populate(struct ofono_modem *modem)
{
struct isi_data *isi = ofono_modem_get_data(modem);
@@ -160,8 +160,6 @@ static int isi_modem_populate(struct ofono_modem *modem)
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);
-
- return 0;
}
static struct ofono_modem_driver driver = {
diff --git a/include/modem.h b/include/modem.h
index 7f459956..c8de670a 100644
--- a/include/modem.h
+++ b/include/modem.h
@@ -65,7 +65,7 @@ struct ofono_modem_driver {
int (*disable)(struct ofono_modem *modem);
/* Populate the atoms supported by this device */
- int (*populate)(struct ofono_modem *modem);
+ void (*populate)(struct ofono_modem *modem);
};
int ofono_modem_driver_register(const struct ofono_modem_driver *);
diff --git a/plugins/generic_at.c b/plugins/generic_at.c
index 3ba39156..3a36525e 100644
--- a/plugins/generic_at.c
+++ b/plugins/generic_at.c
@@ -501,7 +501,7 @@ static int generic_at_disable(struct ofono_modem *modem)
return 0;
}
-static int generic_at_populate(struct ofono_modem *modem)
+static void generic_at_populate(struct ofono_modem *modem)
{
struct generic_at_data *d = ofono_modem_get_data(modem);
GAtChat *chat = d->chat;
@@ -523,8 +523,6 @@ static int generic_at_populate(struct ofono_modem *modem)
mw = ofono_message_waiting_create(modem);
if (mw)
ofono_message_waiting_register(mw);
-
- return 0;
}
static struct ofono_modem_driver driver = {