[alsa-devel] [PATCH 5/6] ALSA: hda - Drop azx_mixer_create()
Takashi Iwai
tiwai at suse.de
Fri Feb 20 08:08:26 CET 2015
It's just an indirection, so let the caller directly calling
snd_hda_build_controls().
Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
sound/pci/hda/hda_controller.c | 7 -------
sound/pci/hda/hda_controller.h | 1 -
sound/pci/hda/hda_intel.c | 2 +-
sound/pci/hda/hda_tegra.c | 2 +-
4 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
index 6b3254d479e1..6fab39133051 100644
--- a/sound/pci/hda/hda_controller.c
+++ b/sound/pci/hda/hda_controller.c
@@ -1923,13 +1923,6 @@ int azx_codec_configure(struct azx *chip)
}
EXPORT_SYMBOL_GPL(azx_codec_configure);
-/* mixer creation - all stuff is implemented in hda module */
-int azx_mixer_create(struct azx *chip)
-{
- return snd_hda_build_controls(chip->bus);
-}
-EXPORT_SYMBOL_GPL(azx_mixer_create);
-
static bool is_input_stream(struct azx *chip, unsigned char index)
{
diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h
index bd50b49cdd0d..79808e1a79ac 100644
--- a/sound/pci/hda/hda_controller.h
+++ b/sound/pci/hda/hda_controller.h
@@ -436,7 +436,6 @@ int azx_codec_create(struct azx *chip, const char *model,
unsigned int max_slots,
int *power_save_to);
int azx_codec_configure(struct azx *chip);
-int azx_mixer_create(struct azx *chip);
int azx_init_stream(struct azx *chip);
void azx_notifier_register(struct azx *chip);
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index ced44a75f8ea..b0a05691abe7 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1923,7 +1923,7 @@ static int azx_probe_continue(struct azx *chip)
goto out_free;
/* create mixer controls */
- err = azx_mixer_create(chip);
+ err = snd_hda_build_controls(chip->bus);
if (err < 0)
goto out_free;
diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c
index 7d0d04480f48..f305c2a99206 100644
--- a/sound/pci/hda/hda_tegra.c
+++ b/sound/pci/hda/hda_tegra.c
@@ -516,7 +516,7 @@ static int hda_tegra_probe(struct platform_device *pdev)
goto out_free;
/* create mixer controls */
- err = azx_mixer_create(chip);
+ err = snd_hda_build_controls(chip->bus);
if (err < 0)
goto out_free;
--
2.3.0
More information about the Alsa-devel
mailing list