summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_codec.h
diff options
context:
space:
mode:
authorTakashi Iwai2015-02-17 13:56:29 +0100
committerTakashi Iwai2015-02-17 14:23:57 +0100
commitef7449780ebb596b47d5019eb7ba7878c30a3404 (patch)
tree1eb413a617ebca8e9e81cc2080208cdba3e5a32b /sound/pci/hda/hda_codec.h
parentASoC: Intel: add SNDRV_PCM_INFO_DRAIN_TRIGGER flag (diff)
downloadkernel-qcow2-linux-ef7449780ebb596b47d5019eb7ba7878c30a3404.tar.gz
kernel-qcow2-linux-ef7449780ebb596b47d5019eb7ba7878c30a3404.tar.xz
kernel-qcow2-linux-ef7449780ebb596b47d5019eb7ba7878c30a3404.zip
ALSA: hda - Drop hda_bus_template for snd_hda_bus_new()
Instead of copying from the given template, let the caller fills the fields after creation. This simplifies the code after all. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.h')
-rw-r--r--sound/pci/hda/hda_codec.h13
1 files changed, 1 insertions, 12 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index 9c8820f21f94..5a6594884069 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -101,15 +101,6 @@ struct hda_bus_ops {
#endif
};
-/* template to pass to the bus constructor */
-struct hda_bus_template {
- void *private_data;
- struct pci_dev *pci;
- const char *modelname;
- int *power_save;
- struct hda_bus_ops ops;
-};
-
/*
* codec bus
*
@@ -119,7 +110,6 @@ struct hda_bus_template {
struct hda_bus {
struct snd_card *card;
- /* copied from template */
void *private_data;
struct pci_dev *pci;
const char *modelname;
@@ -420,8 +410,7 @@ enum {
/*
* constructors
*/
-int snd_hda_bus_new(struct snd_card *card, const struct hda_bus_template *temp,
- struct hda_bus **busp);
+int snd_hda_bus_new(struct snd_card *card, struct hda_bus **busp);
int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
struct hda_codec **codecp);
int snd_hda_codec_configure(struct hda_codec *codec);