hfpmodem: Remove useless NULL checks before g_free

diff --git a/drivers/hfpmodem/call-volume.c b/drivers/hfpmodem/call-volume.c
index 95065d2..d3807f7 100644 (file)
--- a/drivers/hfpmodem/call-volume.c
+++ b/drivers/hfpmodem/call-volume.c
@@ -86,8 +86,7 @@ static void hfp_speaker_volume(struct ofono_call_volume *cv,
                return;
 
 error:
-       if (cbd)
-               g_free(cbd);
+       g_free(cbd);
 
        CALLBACK_WITH_FAILURE(cb, data);
 }
@@ -114,8 +113,7 @@ static void hfp_microphone_volume(struct ofono_call_volume *cv,
                return;
 
 error:
-       if (cbd)
-               g_free(cbd);
+       g_free(cbd);
 
        CALLBACK_WITH_FAILURE(cb, data);
 }

diff --git a/drivers/hfpmodem/network-registration.c b/drivers/hfpmodem/network-registration.c
index 8478966..5f123fc 100644 (file)
--- a/drivers/hfpmodem/network-registration.c
+++ b/drivers/hfpmodem/network-registration.c
@@ -247,8 +247,7 @@ static void hfp_registration_status(struct ofono_netreg *netreg,
                return;
 
 error:
-       if (cbd)
-               g_free(cbd);
+       g_free(cbd);
 
        CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, data);
 }
@@ -295,8 +294,7 @@ static void hfp_signal_strength(struct ofono_netreg *netreg,
                return;
 
 error:
-       if (cbd)
-               g_free(cbd);
+       g_free(cbd);
 
        CALLBACK_WITH_FAILURE(cb, -1, data);
 }

diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c
index 69923cc..8ae4430 100644 (file)
--- a/drivers/hfpmodem/voicecall.c
+++ b/drivers/hfpmodem/voicecall.c
@@ -380,8 +380,7 @@ static void hfp_dial(struct ofono_voicecall *vc,
                return;
 
 error:
-       if (cbd)
-               g_free(cbd);
+       g_free(cbd);
 
        CALLBACK_WITH_FAILURE(cb, data);
 }
@@ -406,8 +405,7 @@ static void hfp_template(const char *cmd, struct ofono_voicecall *vc,
                return;
 
 error:
-       if (req)
-               g_free(req);
+       g_free(req);
 
        CALLBACK_WITH_FAILURE(cb, data);
 }
@@ -523,8 +521,7 @@ static void hfp_release_specific(struct ofono_voicecall *vc, int id,
                return;
 
 error:
-       if (req)
-               g_free(req);
+       g_free(req);
 
        CALLBACK_WITH_FAILURE(cb, data);
 }
@@ -612,8 +609,7 @@ static void hfp_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
                return;
 
 error:
-       if (req)
-               g_free(req);
+       g_free(req);
 
        CALLBACK_WITH_FAILURE(cb, data);
 }