diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-02-19 12:06:45 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-02-19 15:41:32 -0500 |
commit | b8f28d53641f13902790904ab15028ff8ecd0882 (patch) | |
tree | 9a45dc199ce631e95c877e77b86c069fb439e776 | |
parent | 89a93fea6182a71cedce9de1d901e4f379322cf3 (diff) |
ALSA: hda - Drop azx_mixer_create()
It's just an indirection, so let the caller directly calling
snd_hda_build_controls().
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/hda_controller.c | 7 | ||||
-rw-r--r-- | sound/pci/hda/hda_controller.h | 1 | ||||
-rw-r--r-- | sound/pci/hda/hda_intel.c | 2 | ||||
-rw-r--r-- | 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) | |||
1923 | } | 1923 | } |
1924 | EXPORT_SYMBOL_GPL(azx_codec_configure); | 1924 | EXPORT_SYMBOL_GPL(azx_codec_configure); |
1925 | 1925 | ||
1926 | /* mixer creation - all stuff is implemented in hda module */ | ||
1927 | int azx_mixer_create(struct azx *chip) | ||
1928 | { | ||
1929 | return snd_hda_build_controls(chip->bus); | ||
1930 | } | ||
1931 | EXPORT_SYMBOL_GPL(azx_mixer_create); | ||
1932 | |||
1933 | 1926 | ||
1934 | static bool is_input_stream(struct azx *chip, unsigned char index) | 1927 | static bool is_input_stream(struct azx *chip, unsigned char index) |
1935 | { | 1928 | { |
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, | |||
436 | unsigned int max_slots, | 436 | unsigned int max_slots, |
437 | int *power_save_to); | 437 | int *power_save_to); |
438 | int azx_codec_configure(struct azx *chip); | 438 | int azx_codec_configure(struct azx *chip); |
439 | int azx_mixer_create(struct azx *chip); | ||
440 | int azx_init_stream(struct azx *chip); | 439 | int azx_init_stream(struct azx *chip); |
441 | 440 | ||
442 | void azx_notifier_register(struct azx *chip); | 441 | 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) | |||
1923 | goto out_free; | 1923 | goto out_free; |
1924 | 1924 | ||
1925 | /* create mixer controls */ | 1925 | /* create mixer controls */ |
1926 | err = azx_mixer_create(chip); | 1926 | err = snd_hda_build_controls(chip->bus); |
1927 | if (err < 0) | 1927 | if (err < 0) |
1928 | goto out_free; | 1928 | goto out_free; |
1929 | 1929 | ||
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) | |||
516 | goto out_free; | 516 | goto out_free; |
517 | 517 | ||
518 | /* create mixer controls */ | 518 | /* create mixer controls */ |
519 | err = azx_mixer_create(chip); | 519 | err = snd_hda_build_controls(chip->bus); |
520 | if (err < 0) | 520 | if (err < 0) |
521 | goto out_free; | 521 | goto out_free; |
522 | 522 | ||