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>

1 files changed, 6 insertions, 8 deletions

diff --git a/sound/pci/asihpi/hpios.h b/sound/pci/asihpi/hpios.h
index d59a05944537..c5cef113c209 100644
--- a/sound/pci/asihpi/hpios.h
+++ b/sound/pci/asihpi/hpios.h
@@ -149,20 +149,18 @@ static inline void cond_unlock(struct hpios_spinlock *l)
 #define hpios_alistlock_lock(obj) spin_lock(&((obj)->list_lock.lock))
 #define hpios_alistlock_unlock(obj) spin_unlock(&((obj)->list_lock.lock))
 
+struct snd_card;
+
+/** pci drvdata points to an instance of this struct */
 struct hpi_adapter {
+        struct hpi_adapter_obj *adapter;
+        struct snd_card *snd_card;
+
         /* mutex prevents contention for one card
            between multiple user programs (via ioctl) */
         struct mutex mutex;
-        u16 index;
-        u16 type;
-
-        /* ALSA card structure */
-        void *snd_card_asihpi;
-
         char *p_buffer;
         size_t buffer_size;
-        struct pci_dev *pci;
-        void __iomem *ap_remapped_mem_base[HPI_MAX_ADAPTER_MEM_SPACES];
 };
 
 #endif