stemodem: Remove useless NULL checks before g_free
authorMarcel Holtmann <marcel@holtmann.org>
Mon, 16 Aug 2010 20:11:21 +0000 (22:11 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Mon, 16 Aug 2010 20:11:21 +0000 (22:11 +0200)
drivers/stemodem/gprs-context.c
drivers/stemodem/voicecall.c

index ace9d6e..d3a50a9 100644 (file)
@@ -352,8 +352,7 @@ static void ste_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
                return;
 
 error:
-       if (ncbd)
-               g_free(ncbd);
+       g_free(ncbd);
 
        gcd->active_context = 0;
 
@@ -399,8 +398,7 @@ static void ste_gprs_activate_primary(struct ofono_gprs_context *gc,
        return;
 
 error:
-       if (cbd)
-               g_free(cbd);
+       g_free(cbd);
 
        CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data);
 }
@@ -439,8 +437,7 @@ static void ste_gprs_deactivate_primary(struct ofono_gprs_context *gc,
                return;
 
 error:
-       if (cbd)
-               g_free(cbd);
+       g_free(cbd);
 
        CALLBACK_WITH_FAILURE(cb, data);
 }
index aa5a071..5cf38bb 100644 (file)
@@ -222,8 +222,7 @@ static void ste_dial(struct ofono_voicecall *vc,
                return;
 
 error:
-       if (cbd)
-               g_free(cbd);
+       g_free(cbd);
 
        CALLBACK_WITH_FAILURE(cb, data);
 }
@@ -248,8 +247,7 @@ static void ste_template(const char *cmd, struct ofono_voicecall *vc,
                return;
 
 error:
-       if (req)
-               g_free(req);
+       g_free(req);
 
        CALLBACK_WITH_FAILURE(cb, data);
 }
@@ -315,8 +313,7 @@ static void ste_release_specific(struct ofono_voicecall *vc, int id,
                return;
 
 error:
-       if (req)
-               g_free(req);
+       g_free(req);
 
        CALLBACK_WITH_FAILURE(cb, data);
 }
@@ -401,8 +398,7 @@ static void ste_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
                return;
 
 error:
-       if (cbd)
-               g_free(cbd);
+       g_free(cbd);
 
        CALLBACK_WITH_FAILURE(cb, data);
 }