From 12e481104d09f23297e443bf1b66ec11f38c5f15 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 18 Jan 2012 11:24:14 -0600 Subject: network: Use __ofono_atom_find macro --- src/network.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/network.c') diff --git a/src/network.c b/src/network.c index 0699ff22..1b9b3633 100644 --- a/src/network.c +++ b/src/network.c @@ -2040,7 +2040,6 @@ void ofono_netreg_register(struct ofono_netreg *netreg) DBusConnection *conn = ofono_dbus_get_connection(); struct ofono_modem *modem = __ofono_atom_get_modem(netreg->atom); const char *path = __ofono_atom_get_path(netreg->atom); - struct ofono_atom *sim_atom; if (!g_dbus_register_interface(conn, path, OFONO_NETWORK_REGISTRATION_INTERFACE, @@ -2061,11 +2060,9 @@ void ofono_netreg_register(struct ofono_netreg *netreg) netreg->driver->registration_status(netreg, init_registration_status, netreg); - sim_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SIM); - - if (sim_atom != NULL) { + netreg->sim = __ofono_atom_find(OFONO_ATOM_TYPE_SIM, modem); + if (netreg->sim != NULL) { /* Assume that if sim atom exists, it is ready */ - netreg->sim = __ofono_atom_get_data(sim_atom); netreg->sim_context = ofono_sim_context_create(netreg->sim); netreg_load_settings(netreg); -- cgit v1.2.3