[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/7] audio: Simplify audio_bug() removing old code
From: |
Gerd Hoffmann |
Subject: |
[PULL 6/7] audio: Simplify audio_bug() removing old code |
Date: |
Tue, 15 Dec 2020 14:48:25 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20201210223506.263709-1-philmd@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
audio/audio.c | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/audio/audio.c b/audio/audio.c
index a21340927033..0fdb808d6a57 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.27.0
- [PULL 0/7] Audio 20201215 patches, Gerd Hoffmann, 2020/12/15
- [PULL 1/7] coreaudio: rename misnamed variable fake_as, Gerd Hoffmann, 2020/12/15
- [PULL 4/7] audio: remove unused function audio_is_cleaning_up(), Gerd Hoffmann, 2020/12/15
- [PULL 5/7] cs4231: Get rid of empty property array, Gerd Hoffmann, 2020/12/15
- [PULL 3/7] coreaudio: always stop audio playback on shut down, Gerd Hoffmann, 2020/12/15
- [PULL 2/7] coreaudio: don't start playback in init routine, Gerd Hoffmann, 2020/12/15
- [PULL 7/7] audio: add sanity check, Gerd Hoffmann, 2020/12/15
- [PULL 6/7] audio: Simplify audio_bug() removing old code,
Gerd Hoffmann <=
- Re: [PULL 0/7] Audio 20201215 patches, Peter Maydell, 2020/12/15