staging: vt6655: replace typedef struct tagDEVICE_TD_INFO and structure

Create struct vnt_td_info with members
mic_hdr
skb
buf
buf_dma
dwReqCount -> req_count
byFlags -> flags

In struct tagSTxDesc volatile is removed because it will generate a warning
(in any case this member is not) and renaming td_info.

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 0b786cf..452971c 100644 (file)
--- a/drivers/staging/vt6655/desc.h
+++ b/drivers/staging/vt6655/desc.h
@@ -240,14 +240,14 @@ struct vnt_tdes1 {
        volatile u8 reserved;
 } __packed;
 
-typedef struct tagDEVICE_TD_INFO {
+struct vnt_td_info {
        void *mic_hdr;
        struct sk_buff *skb;
        unsigned char *buf;
-       dma_addr_t          buf_dma;
-       u16 dwReqCount;
-       unsigned char byFlags;
-} DEVICE_TD_INFO,    *PDEVICE_TD_INFO;
+       dma_addr_t buf_dma;
+       u16 req_count;
+       u8 flags;
+};
 
 /* transmit descriptor */
 typedef struct tagSTxDesc {
@@ -256,7 +256,7 @@ typedef struct tagSTxDesc {
        volatile    __le32  buff_addr;
        volatile    __le32  next_desc;
        struct tagSTxDesc *next __aligned(8);
-       volatile    PDEVICE_TD_INFO pTDInfo __aligned(8);
+       struct vnt_td_info *td_info __aligned(8);
 } __attribute__ ((__packed__))
 STxDesc, *PSTxDesc;
 typedef const STxDesc *PCSTxDesc;

diff --cc drivers/staging/vt6655/device.h
Simple merge

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

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