[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] audio: Simplify audio_bug() removing old code
From: |
Marc-André Lureau |
Subject: |
Re: [PATCH] audio: Simplify audio_bug() removing old code |
Date: |
Fri, 11 Dec 2020 11:33:58 +0400 |
On Fri, Dec 11, 2020 at 2:35 AM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
>
> This code (introduced in commit 1d14ffa97ea, Oct 2005)
> is likely unused since years. Time to remove it. If
> the condition is true, simply call abort().
>
> Suggested-by: Gerd Hoffmann <gerd@kraxel.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
It is going to conflict with the patch from "[PATCH v2 00/13] Remove
GCC < 4.8 checks". I'll drop it if yours goes first.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> audio/audio.c | 19 +------------------
> 1 file changed, 1 insertion(+), 18 deletions(-)
>
> diff --git a/audio/audio.c b/audio/audio.c
> index 46578e4a583..b71ab8912c5 100644
> --- a/audio/audio.c
> +++ b/audio/audio.c
> @@ -104,9 +104,6 @@ const struct mixeng_volume nominal_volume = {
>
> static bool legacy_config = true;
>
> -#ifdef AUDIO_IS_FLAWLESS_AND_NO_CHECKS_ARE_REQURIED
> -#error No its not
> -#else
> int audio_bug (const char *funcname, int cond)
> {
> if (cond) {
> @@ -119,25 +116,11 @@ int audio_bug (const char *funcname, int cond)
> AUD_log (NULL, "I am sorry\n");
> }
> AUD_log (NULL, "Context:\n");
> -
> -#if defined AUDIO_BREAKPOINT_ON_BUG
> -# if defined HOST_I386
> -# if defined __GNUC__
> - __asm__ ("int3");
> -# elif defined _MSC_VER
> - _asm _emit 0xcc;
> -# else
> - abort ();
> -# endif
> -# else
> - abort ();
> -# endif
> -#endif
> + abort();
> }
>
> return cond;
> }
> -#endif
>
> static inline int audio_bits_to_index (int bits)
> {
> --
> 2.26.2
>