summaryrefslogtreecommitdiff
path: root/sound/pci/asihpi/hpicmn.h
diff options
context:
space:
mode:
authorEliot Blennerhassett <eblennerhassett@audioscience.com>2011-12-22 00:38:43 (GMT)
committerTakashi Iwai <tiwai@suse.de>2011-12-22 07:13:05 (GMT)
commit7036b92d303a01477e27a5a9b2d582a5df3cc8ef (patch)
tree88844df385154f1eb3657137a6b531ca0b3a29ad /sound/pci/asihpi/hpicmn.h
parent3dad06ac89f4b63fcce5020abbe1b3e5754e26dd (diff)
downloadlinux-7036b92d303a01477e27a5a9b2d582a5df3cc8ef.tar.xz
ALSA: asihpi - Remove redundant struct members.
Structs hpi_adapter and snd_card_asihpi had members that duplicate those in underlying hpi_adapter_obj or whose info can be retrieved using hpi_adapter_get_info(). Print less info in probe function, it can be retrieved from /proc. Avoid name redundancy: hpi_adapter_obj.adapter_type renamed to .type Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/asihpi/hpicmn.h')
-rw-r--r--sound/pci/asihpi/hpicmn.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/pci/asihpi/hpicmn.h b/sound/pci/asihpi/hpicmn.h
index 67cc1b0..e441212 100644
--- a/sound/pci/asihpi/hpicmn.h
+++ b/sound/pci/asihpi/hpicmn.h
@@ -18,12 +18,15 @@
*/
+struct hpi_adapter_obj;
+
+/* a function that takes an adapter obj and returns an int */
+typedef int adapter_int_func(struct hpi_adapter_obj *pao);
+
struct hpi_adapter_obj {
struct hpi_pci pci; /* PCI info - bus#,dev#,address etc */
- u16 adapter_type; /* ASI6701 etc */
- u16 index; /* */
- u16 open; /* =1 when adapter open */
- u16 mixer_open;
+ u16 type; /* 0x6644 == ASI6644 etc */
+ u16 index;
struct hpios_spinlock dsp_lock;