stemodem: remove NULL check

diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c
index 0be4238..e247f35 100644 (file)
--- a/drivers/stemodem/gprs-context.c
+++ b/drivers/stemodem/gprs-context.c
@@ -383,9 +383,6 @@ static void ste_gprs_activate_primary(struct ofono_gprs_context *gc,
        GSList *l;
        struct conn_info *conn;
 
-       if (cbd == NULL)
-               goto error_no_device;
-
        gcd->active_context = ctx->cid;
        cbd->user = gc;
 
@@ -448,9 +445,6 @@ static void ste_gprs_deactivate_primary(struct ofono_gprs_context *gc,
        char buf[64];
        GSList *l;
 
-       if (cbd == NULL)
-               goto error;
-
        gcd->active_context = id;
        cbd->user = gc;
 

diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c
index 5210483..1c7c0bd 100644 (file)
--- a/drivers/stemodem/voicecall.c
+++ b/drivers/stemodem/voicecall.c
@@ -187,9 +187,6 @@ static void ste_dial(struct ofono_voicecall *vc,
        struct cb_data *cbd = cb_data_new(cb, data);
        char buf[256];
 
-       if (cbd == NULL)
-               goto error;
-
        cbd->user = vc;
 
        if (ph->type == 145)
@@ -214,7 +211,6 @@ static void ste_dial(struct ofono_voicecall *vc,
                                atd_cb, cbd, g_free) > 0)
                return;
 
-error:
        g_free(cbd);
 
        CALLBACK_WITH_FAILURE(cb, data);
@@ -370,9 +366,6 @@ static void ste_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
        int s;
        char *buf;
 
-       if (cbd == NULL)
-               goto error;
-
        /* strlen("AT+VTS=) = 7 + NULL */
        buf = g_try_new(char, strlen(dtmf) + 8);
        if (buf == NULL)