[v1] Audio clean-ups

[PATCH 36/43] audio: rename audio_get_id()

marcandre.lureau@redhat.com posted 43 patches 1 week, 2 days ago

Diff against v2 v3
Download mbox

Maintainers: Gerd Hoffmann <kraxel@redhat.com>, Christian Schoenebeck <qemu_oss@crudebyte.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>, Thomas Huth <huth@tuxfamily.org>, Alexandre Ratchov <alex@caoua.org>, Paolo Bonzini <pbonzini@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Peter Maydell <peter.maydell@linaro.org>, Jan Kiszka <jan.kiszka@web.de>, Alistair Francis <alistair@alistair23.me>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Laurent Vivier <laurent@vivier.eu>, "Michael S. Tsirkin" <mst@redhat.com>, Manos Pitsidianakis <manos.pitsidianakis@linaro.org>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Yanan Wang <wangyanan55@huawei.com>, Zhao Liu <zhao1.liu@intel.com>, "Hervé Poussineau" <hpoussin@reactos.org>, BALATON Zoltan <balaton@eik.bme.hu>, Jiaxun Yang <jiaxun.yang@flygoat.com>, "Alex Bennée" <alex.bennee@linaro.org>

There is a newer version of this series

Expand all Fold all

[PATCH 36/43] audio: rename audio_get_id()

Posted by marcandre.lureau@redhat.com 1 week, 2 days ago

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

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 audio/audio.h                    | 2 +-
 audio/audio.c                    | 2 +-
 hw/core/qdev-properties-system.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/audio/audio.h b/audio/audio.h
index a43ca0700c..85e588a885 100644
--- a/audio/audio.h
+++ b/audio/audio.h
@@ -156,7 +156,7 @@ void audio_help(void);
 
 AudioBE *audio_be_by_name(const char *name, Error **errp);
 AudioBE *audio_get_default_audio_be(Error **errp);
-const char *audio_get_id(AudioFE *fe);
+const char *audio_fe_get_be_id(AudioFE *fe);
 
 #define DEFINE_AUDIO_PROPERTIES(_s, _f)         \
     DEFINE_PROP_AUDIODEV("audiodev", _s, _f)
diff --git a/audio/audio.c b/audio/audio.c
index 7463bbd283..35753ebb97 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -2232,7 +2232,7 @@ AudioBE *audio_be_by_name(const char *name, Error **errp)
     }
 }
 
-const char *audio_get_id(AudioFE *card)
+const char *audio_fe_get_be_id(AudioFE *card)
 {
     if (card->be) {
         assert(card->be->dev);
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index fc8e5eb07a..701f6553c5 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -488,7 +488,7 @@ static void get_audiodev(Object *obj, Visitor *v, const char* name,
 {
     const Property *prop = opaque;
     AudioFE *card = object_field_prop_ptr(obj, prop);
-    char *p = g_strdup(audio_get_id(card));
+    char *p = g_strdup(audio_fe_get_be_id(card));
 
     visit_type_str(v, name, &p, errp);
     g_free(p);
-- 
2.51.0