diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-08-08 22:35:44 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-08-08 22:35:44 +0200 |
commit | 3a76a41ffbf94c49245f5050be97d389b7d28102 (patch) | |
tree | 4c713e97619a5ae91674fd6e744c7f776385aee1 /sound/pci/hda/hda_controller.c | |
parent | 118b2806a07605d6e3c880e35a5c472bfda7582f (diff) | |
parent | d4ff1b3917a529bdc75592af6b1504ad6c4029f7 (diff) | |
download | lwn-3a76a41ffbf94c49245f5050be97d389b7d28102.tar.gz lwn-3a76a41ffbf94c49245f5050be97d389b7d28102.zip |
Merge branch 'topic/hda-bus-ops-cleanup' into for-next
Pull HD-audio bus ops cleanups.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_controller.c')
-rw-r--r-- | sound/pci/hda/hda_controller.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 4b4cb0fd5102..156930d0c9d3 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -1205,14 +1205,12 @@ void snd_hda_bus_reset(struct hda_bus *bus) } /* HD-audio bus initialization */ -int azx_bus_init(struct azx *chip, const char *model, - const struct hdac_io_ops *io_ops) +int azx_bus_init(struct azx *chip, const char *model) { struct hda_bus *bus = &chip->bus; int err; - err = snd_hdac_bus_init(&bus->core, chip->card->dev, &bus_core_ops, - io_ops); + err = snd_hdac_bus_init(&bus->core, chip->card->dev, &bus_core_ops); if (err < 0) return err; |