[PATCH v2 05/17] audio: remove sw == NULL check

Volker Rümelin posted 17 patches 3 years ago
Maintainers: Gerd Hoffmann <kraxel@redhat.com>
There is a newer version of this series
[PATCH v2 05/17] audio: remove sw == NULL check
Posted by Volker Rümelin 3 years ago
All call sites of audio_pcm_sw_write() guarantee that sw is not
NULL. Remove the unnecessary NULL check.

Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
 audio/audio.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/audio/audio.c b/audio/audio.c
index 4412b5fad8..8f1c0e77b0 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -712,10 +712,6 @@ static size_t audio_pcm_sw_write(SWVoiceOut *sw, void *buf, size_t size)
     size_t hw_free;
     size_t ret, total;
 
-    if (!sw) {
-        return size;
-    }
-
     hwsamples = sw->hw->mix_buf.size;
 
     live = sw->total_hw_samples_mixed;
-- 
2.35.3


Re: [PATCH v2 05/17] audio: remove sw == NULL check
Posted by Marc-André Lureau 2 years, 11 months ago
On Mon, Feb 6, 2023 at 10:52 PM Volker Rümelin <vr_qemu@t-online.de> wrote:
>
> All call sites of audio_pcm_sw_write() guarantee that sw is not
> NULL. Remove the unnecessary NULL check.
>
> Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>



> ---
>  audio/audio.c | 4 ----
>  1 file changed, 4 deletions(-)
>
> diff --git a/audio/audio.c b/audio/audio.c
> index 4412b5fad8..8f1c0e77b0 100644
> --- a/audio/audio.c
> +++ b/audio/audio.c
> @@ -712,10 +712,6 @@ static size_t audio_pcm_sw_write(SWVoiceOut *sw, void *buf, size_t size)
>      size_t hw_free;
>      size_t ret, total;
>
> -    if (!sw) {
> -        return size;
> -    }
> -
>      hwsamples = sw->hw->mix_buf.size;
>
>      live = sw->total_hw_samples_mixed;
> --
> 2.35.3
>


--
Marc-André Lureau