summaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_codec.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-04-14 22:13:18 +0200
committerTakashi Iwai <tiwai@suse.de>2015-04-16 08:47:22 +0200
commita41d122449bea303ada415ef5fb2bf434f5481f9 (patch)
treee6f516f463dcf330567f226d4e9b1f43b2bc9e0e /sound/pci/hda/hda_codec.h
parentccc98865aa44184e34de8df96dc837726c978949 (diff)
ALSA: hda - Embed bus into controller object
... and replace with the existing hda-core helper codes. This reduces lots of lines, finally. Since struct hda_bus is now embedded into struct azx, snd_hda_bus_new() is moved and expanded from hda_codec.c to hda_controller.c, accordingly. Also private_free bus ops and private_data field are removed because we no longer need to point azx object from bus (we can use container_of()) The spin locks are consolidated into the single one, bus->reg_lock. 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.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
index c8031360de90..57b9aa0f36c1 100644
--- a/sound/pci/hda/hda_codec.h
+++ b/sound/pci/hda/hda_codec.h
@@ -42,8 +42,6 @@ struct hda_pcm_stream;
/* bus operators */
struct hda_bus_ops {
- /* free the private data */
- void (*private_free)(struct hda_bus *);
/* attach a PCM stream */
int (*attach_pcm)(struct hda_bus *bus, struct hda_codec *codec,
struct hda_pcm *pcm);
@@ -73,7 +71,6 @@ struct hda_bus {
struct snd_card *card;
- void *private_data;
struct pci_dev *pci;
const char *modelname;
struct hda_bus_ops ops;