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, 29 insertions, 30 deletions

diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
index 278bec82b6d5..2414d7a2239d 100644
--- a/sound/pci/asihpi/hpi6000.c
+++ b/sound/pci/asihpi/hpi6000.c
@@ -231,6 +231,8 @@ static void subsys_message(struct hpi_message *phm, struct hpi_response *phr)
 static void control_message(struct hpi_adapter_obj *pao,
         struct hpi_message *phm, struct hpi_response *phr)
 {
+        struct hpi_hw_obj *phw = pao->priv;
+
         switch (phm->function) {
         case HPI_CONTROL_GET_STATE:
                 if (pao->has_control_cache) {
@@ -248,17 +250,14 @@ static void control_message(struct hpi_adapter_obj *pao,
                                 break;
                         }
 
-                        if (hpi_check_control_cache(((struct hpi_hw_obj *)
-                                                pao->priv)->p_cache, phm,
-                                        phr))
+                        if (hpi_check_control_cache(phw->p_cache, phm, phr))
                                 break;
                 }
                 hw_message(pao, phm, phr);
                 break;
         case HPI_CONTROL_SET_STATE:
                 hw_message(pao, phm, phr);
-                hpi_cmn_control_cache_sync_to_msg(((struct hpi_hw_obj *)pao->
-                                priv)->p_cache, phm, phr);
+                hpi_cmn_control_cache_sync_to_msg(phw->p_cache, phm, phr);
                 break;
 
         case HPI_CONTROL_GET_INFO:
@@ -451,11 +450,11 @@ static void subsys_create_adapter(struct hpi_message *phm,
         }
 
         for (dsp_index = 0; dsp_index < MAX_DSPS; dsp_index++) {
-                struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+                struct hpi_hw_obj *phw = pao->priv;
                 phw->ado[dsp_index].pa_parent_adapter = pao;
         }
 
-        phr->u.s.adapter_type = ao.adapter_type;
+        phr->u.s.adapter_type = ao.type;
         phr->u.s.adapter_index = ao.index;
         phr->error = 0;
 }
@@ -476,7 +475,7 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
         u32 dsp_index = 0;
         u32 control_cache_size = 0;
         u32 control_cache_count = 0;
-        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+        struct hpi_hw_obj *phw = pao->priv;
 
         /* The PCI2040 has the following address map */
         /* BAR0 - 4K = HPI control and status registers on PCI2040 (HPI CSR) */
@@ -559,7 +558,7 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
                         if (error)
                                 return error;
                 }
-                pao->adapter_type = hr0.u.ax.info.adapter_type;
+                pao->type = hr0.u.ax.info.adapter_type;
                 pao->index = hr0.u.ax.info.adapter_index;
         }
 
@@ -584,9 +583,8 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
                         pao->has_control_cache = 1;
         }
 
-        HPI_DEBUG_LOG(DEBUG, "get adapter info ASI%04X index %d\n",
-                pao->adapter_type, pao->index);
-        pao->open = 0;  /* upon creation the adapter is closed */
+        HPI_DEBUG_LOG(DEBUG, "get adapter info ASI%04X index %d\n", pao->type,
+                pao->index);
 
         if (phw->p_cache)
                 phw->p_cache->adap_idx = pao->index;
@@ -596,7 +594,7 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
 
 static void delete_adapter_obj(struct hpi_adapter_obj *pao)
 {
-        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+        struct hpi_hw_obj *phw = pao->priv;
 
         if (pao->has_control_cache)
                 hpi_free_control_cache(phw->p_cache);
@@ -639,7 +637,7 @@ static void adapter_get_asserts(struct hpi_adapter_obj *pao,
 static short hpi6000_adapter_boot_load_dsp(struct hpi_adapter_obj *pao,
         u32 *pos_error_code)
 {
-        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+        struct hpi_hw_obj *phw = pao->priv;
         short error;
         u32 timeout;
         u32 read = 0;
@@ -1220,8 +1218,8 @@ static void hpi_read_block(struct dsp_obj *pdo, u32 address, u32 *pdata,
 static u16 hpi6000_dsp_block_write32(struct hpi_adapter_obj *pao,
         u16 dsp_index, u32 hpi_address, u32 *source, u32 count)
 {
-        struct dsp_obj *pdo =
-                &(*(struct hpi_hw_obj *)pao->priv).ado[dsp_index];
+        struct hpi_hw_obj *phw = pao->priv;
+        struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 time_out = PCI_TIMEOUT;
         int c6711_burst_size = 128;
         u32 local_hpi_address = hpi_address;
@@ -1258,8 +1256,8 @@ static u16 hpi6000_dsp_block_write32(struct hpi_adapter_obj *pao,
 static u16 hpi6000_dsp_block_read32(struct hpi_adapter_obj *pao,
         u16 dsp_index, u32 hpi_address, u32 *dest, u32 count)
 {
-        struct dsp_obj *pdo =
-                &(*(struct hpi_hw_obj *)pao->priv).ado[dsp_index];
+        struct hpi_hw_obj *phw = pao->priv;
+        struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 time_out = PCI_TIMEOUT;
         int c6711_burst_size = 16;
         u32 local_hpi_address = hpi_address;
@@ -1298,7 +1296,7 @@ static u16 hpi6000_dsp_block_read32(struct hpi_adapter_obj *pao,
 static short hpi6000_message_response_sequence(struct hpi_adapter_obj *pao,
         u16 dsp_index, struct hpi_message *phm, struct hpi_response *phr)
 {
-        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+        struct hpi_hw_obj *phw = pao->priv;
         struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 timeout;
         u16 ack;
@@ -1414,8 +1412,8 @@ static short hpi6000_send_data_check_adr(u32 address, u32 length_in_dwords)
 static short hpi6000_send_data(struct hpi_adapter_obj *pao, u16 dsp_index,
         struct hpi_message *phm, struct hpi_response *phr)
 {
-        struct dsp_obj *pdo =
-                &(*(struct hpi_hw_obj *)pao->priv).ado[dsp_index];
+        struct hpi_hw_obj *phw = pao->priv;
+        struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 data_sent = 0;
         u16 ack;
         u32 length, address;
@@ -1487,8 +1485,8 @@ static short hpi6000_send_data(struct hpi_adapter_obj *pao, u16 dsp_index,
 static short hpi6000_get_data(struct hpi_adapter_obj *pao, u16 dsp_index,
         struct hpi_message *phm, struct hpi_response *phr)
 {
-        struct dsp_obj *pdo =
-                &(*(struct hpi_hw_obj *)pao->priv).ado[dsp_index];
+        struct hpi_hw_obj *phw = pao->priv;
+        struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 data_got = 0;
         u16 ack;
         u32 length, address;
@@ -1551,8 +1549,8 @@ static void hpi6000_send_dsp_interrupt(struct dsp_obj *pdo)
 static short hpi6000_send_host_command(struct hpi_adapter_obj *pao,
         u16 dsp_index, u32 host_cmd)
 {
-        struct dsp_obj *pdo =
-                &(*(struct hpi_hw_obj *)pao->priv).ado[dsp_index];
+        struct hpi_hw_obj *phw = pao->priv;
+        struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 timeout = TIMEOUT;
 
         /* set command */
@@ -1577,7 +1575,7 @@ static short hpi6000_check_PCI2040_error_flag(struct hpi_adapter_obj *pao,
 {
         u32 hPI_error;
 
-        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+        struct hpi_hw_obj *phw = pao->priv;
 
         /* read the error bits from the PCI2040 */
         hPI_error = ioread32(phw->dw2040_HPICSR + HPI_ERROR_REPORT);
@@ -1597,8 +1595,8 @@ static short hpi6000_check_PCI2040_error_flag(struct hpi_adapter_obj *pao,
 static short hpi6000_wait_dsp_ack(struct hpi_adapter_obj *pao, u16 dsp_index,
         u32 ack_value)
 {
-        struct dsp_obj *pdo =
-                &(*(struct hpi_hw_obj *)pao->priv).ado[dsp_index];
+        struct hpi_hw_obj *phw = pao->priv;
+        struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 ack = 0L;
         u32 timeout;
         u32 hPIC = 0L;
@@ -1640,7 +1638,7 @@ static short hpi6000_update_control_cache(struct hpi_adapter_obj *pao,
         struct hpi_message *phm)
 {
         const u16 dsp_index = 0;
-        struct hpi_hw_obj *phw = (struct hpi_hw_obj *)pao->priv;
+        struct hpi_hw_obj *phw = pao->priv;
         struct dsp_obj *pdo = &phw->ado[dsp_index];
         u32 timeout;
         u32 cache_dirty_flag;
@@ -1740,7 +1738,8 @@ static void hw_message(struct hpi_adapter_obj *pao, struct hpi_message *phm,
 {
         u16 error = 0;
         u16 dsp_index = 0;
-        u16 num_dsp = ((struct hpi_hw_obj *)pao->priv)->num_dsp;
+        struct hpi_hw_obj *phw = pao->priv;
+        u16 num_dsp = phw->num_dsp;
 
         if (num_dsp < 2)
                 dsp_index = 0;