From: Mika Liljeberg <mika.liljeberg@nokia.com>
Date: Tue, 29 Mar 2011 07:48:30 +0000 (+0300)
Subject: atmodem: remove redundant code
X-Git-Tag: 0.46~84
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2e444d1a51726c3983f65c46aa182a15e6f71674;p=platform%2Fupstream%2Fofono.git

atmodem: remove redundant code
---

diff --git a/drivers/atmodem/sim-poll.c b/drivers/atmodem/sim-poll.c
index daef24a..da00ddd 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);
 }