diff options
author | Mika Liljeberg <mika.liljeberg@nokia.com> | 2011-03-29 10:48:30 +0300 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2011-03-30 12:34:39 -0500 |
commit | 2e444d1a51726c3983f65c46aa182a15e6f71674 (patch) | |
tree | 679db121ba0faeb1b7d27125bee076c7dc509e5d /drivers | |
parent | 0eedf429218761109009370b2434c3e7b3350a67 (diff) | |
download | ofono-2e444d1a51726c3983f65c46aa182a15e6f71674.tar.bz2 |
atmodem: remove redundant code
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/atmodem/sim-poll.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/atmodem/sim-poll.c b/drivers/atmodem/sim-poll.c index daef24a2..da00ddd7 100644 --- a/drivers/atmodem/sim-poll.c +++ b/drivers/atmodem/sim-poll.c @@ -239,14 +239,9 @@ static void stk_watch(struct ofono_atom *atom, void atmodem_poll_enable(struct ofono_modem *modem, GAtChat *chat) { - struct ofono_atom *sim_atom; - struct ofono_atom *stk_atom; struct sim_poll_data *spd; - sim_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SIM); - stk_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_STK); - - if (sim_atom == NULL) + if (__ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_SIM) == NULL) return; spd = g_new0(struct sim_poll_data, 1); @@ -256,13 +251,7 @@ void atmodem_poll_enable(struct ofono_modem *modem, GAtChat *chat) spd->stk_watch = __ofono_modem_add_atom_watch(spd->modem, OFONO_ATOM_TYPE_STK, stk_watch, spd, NULL); - if (stk_atom && __ofono_atom_get_registered(stk_atom)) - stk_watch(stk_atom, - OFONO_ATOM_WATCH_CONDITION_REGISTERED, spd); spd->sim_watch = __ofono_modem_add_atom_watch(spd->modem, OFONO_ATOM_TYPE_SIM, sim_watch, spd, NULL); - if (__ofono_atom_get_registered(sim_atom)) - sim_watch(sim_atom, - OFONO_ATOM_WATCH_CONDITION_REGISTERED, spd); } |