staging: vt6655: replace typedef struct tagRDES1

with struct vnt_rdes1 and members
wReqCount -> req_count
wReserved -> reserved

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index ab632e0d8cc4079dd3bc7db477f49a5eae6bf86e..7a30ba2faec2c08e5483f5fefecddb18a807a686 100644 (file)
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -575,7 +575,7 @@ CARDvSafeResetRx(
                pDesc = &(pDevice->aRD0Ring[uu]);
                pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz);
                pDesc->rd0.owner = OWNED_BY_NIC;
-               pDesc->m_rd1RD1.wReqCount = cpu_to_le16(pDevice->rx_buf_sz);
+               pDesc->rd1.req_count = cpu_to_le16(pDevice->rx_buf_sz);
        }
 
        /* init state, all RD is chip's */
@@ -583,7 +583,7 @@ CARDvSafeResetRx(
                pDesc = &(pDevice->aRD1Ring[uu]);
                pDesc->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz);
                pDesc->rd0.owner = OWNED_BY_NIC;
-               pDesc->m_rd1RD1.wReqCount = cpu_to_le16(pDevice->rx_buf_sz);
+               pDesc->rd1.req_count = cpu_to_le16(pDevice->rx_buf_sz);
        }
 
        /* set perPkt mode */

diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h
index 68b3121917b38c61529b092613ccdc925cc1ee68..eb0c7c3c987dd3a538c6c0f2925213d52859b9e6 100644 (file)
--- a/drivers/staging/vt6655/desc.h
+++ b/drivers/staging/vt6655/desc.h
@@ -189,16 +189,15 @@ struct vnt_rdes0 {
 #endif
 } __packed;
 
-typedef struct tagRDES1 {
-       __le16         wReqCount;
-       unsigned short wReserved;
-} __attribute__ ((__packed__))
-SRDES1;
+struct vnt_rdes1 {
+       __le16 req_count;
+       u16 reserved;
+} __packed;
 
 /* Rx descriptor*/
 typedef struct tagSRxDesc {
        volatile struct vnt_rdes0 rd0;
-       volatile SRDES1 m_rd1RD1;
+       volatile struct vnt_rdes1 rd1;
        volatile __le32 buff_addr;
        volatile __le32 next_desc;
        struct tagSRxDesc *next __aligned(8);

diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 37c2be2fbe4c2b2b9eb149b75189aad6072a2216..22c195757f89b4cf936f7f1aeb5cad61aa26659e 100644 (file)
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -818,7 +818,7 @@ static bool device_alloc_rx_buf(struct vnt_private *pDevice, PSRxDesc pRD)
 
        pRD->rd0.res_count = cpu_to_le16(pDevice->rx_buf_sz);
        pRD->rd0.owner = OWNED_BY_NIC;
-       pRD->m_rd1RD1.wReqCount = cpu_to_le16(pDevice->rx_buf_sz);
+       pRD->rd1.req_count = cpu_to_le16(pDevice->rx_buf_sz);
        pRD->buff_addr = cpu_to_le32(pRDInfo->skb_dma);
 
        return true;

diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c
index dbaaeeb94817461c9533b0cf70133f19791e8ec2..ef39cbe28940980e2d74702030fac14217aeeca9 100644 (file)
--- a/drivers/staging/vt6655/dpc.c
+++ b/drivers/staging/vt6655/dpc.c
@@ -143,7 +143,7 @@ bool vnt_receive_frame(struct vnt_private *priv, PSRxDesc curr_rd)
        dma_unmap_single(&priv->pcid->dev, rd_info->skb_dma,
                         priv->rx_buf_sz, DMA_FROM_DEVICE);
 
-       frame_size = le16_to_cpu(curr_rd->m_rd1RD1.wReqCount)
+       frame_size = le16_to_cpu(curr_rd->rd1.req_count)
                        - le16_to_cpu(curr_rd->rd0.res_count);
 
        if ((frame_size > 2364) || (frame_size < 33)) {