staging: vt6655: replaced typedef struct tagTDES1

Create struct vnt_tdes1 that replaces members
wReqCount -> req_count
byTCR -> tcr
byReserved -> reserved

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

diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h
index 00fa348..6efe825 100644 (file)
--- a/drivers/staging/vt6655/desc.h
+++ b/drivers/staging/vt6655/desc.h
@@ -234,12 +234,11 @@ struct vnt_tdes0 {
 #endif
 } __packed;
 
-typedef struct tagTDES1 {
-       volatile    __le16        wReqCount;
-       volatile    unsigned char byTCR;
-       volatile    unsigned char byReserved;
-} __attribute__ ((__packed__))
-STDES1;
+struct vnt_tdes1 {
+       volatile __le16 req_count;
+       volatile u8 tcr;
+       volatile u8 reserved;
+} __packed;
 
 typedef struct tagDEVICE_TD_INFO {
        void *mic_hdr;
@@ -254,7 +253,7 @@ typedef struct tagDEVICE_TD_INFO {
 /* transmit descriptor */
 typedef struct tagSTxDesc {
        volatile struct vnt_tdes0 td0;
-       volatile    STDES1  m_td1TD1;
+       volatile struct vnt_tdes1 td1;
        volatile    __le32  buff_addr;
        volatile    __le32  next_desc;
        struct tagSTxDesc *next __aligned(8);

diff --cc drivers/staging/vt6655/device_main.c
Simple merge