diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-13 12:58:24 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-13 12:58:24 +0100 |
| commit | d61de7255b707f726447d3ed7459e18e0a4fab5b (patch) | |
| tree | 637ead7bd04678af8c72f6acaca186891a990ffa /audio/audio_template.h | |
| parent | 2a2c4830c0068d70443f3dddc4cc668f0c601b5c (diff) | |
| parent | fb7da626c0d178d687f439af2e19401f34bc901e (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20140613-1' into staging
audio: Drop superfluous conditionals around g_free()
# gpg: Signature made Fri 13 Jun 2014 12:14:24 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-audio-20140613-1:
audio: Drop superfluous conditionals around g_free()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'audio/audio_template.h')
| -rw-r--r-- | audio/audio_template.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/audio/audio_template.h b/audio/audio_template.h index 16f7880770..817318853c 100644 --- a/audio/audio_template.h +++ b/audio/audio_template.h @@ -71,10 +71,7 @@ static void glue (audio_init_nb_voices_, TYPE) (struct audio_driver *drv) static void glue (audio_pcm_hw_free_resources_, TYPE) (HW *hw) { - if (HWBUF) { - g_free (HWBUF); - } - + g_free (HWBUF); HWBUF = NULL; } @@ -92,9 +89,7 @@ static int glue (audio_pcm_hw_alloc_resources_, TYPE) (HW *hw) static void glue (audio_pcm_sw_free_resources_, TYPE) (SW *sw) { - if (sw->buf) { - g_free (sw->buf); - } + g_free (sw->buf); if (sw->rate) { st_rate_stop (sw->rate); @@ -172,10 +167,8 @@ static int glue (audio_pcm_sw_init_, TYPE) ( static void glue (audio_pcm_sw_fini_, TYPE) (SW *sw) { glue (audio_pcm_sw_free_resources_, TYPE) (sw); - if (sw->name) { - g_free (sw->name); - sw->name = NULL; - } + g_free (sw->name); + sw->name = NULL; } static void glue (audio_pcm_hw_add_sw_, TYPE) (HW *hw, SW *sw) |