Staging: vt6655: remove U16 custom macro

[deliverable/linux.git] / drivers / staging / vt6655 / desc.h

diff --git a/drivers/staging/vt6655/desc.h b/drivers/staging/vt6655/desc.h
index b573ef77abe1f52b5b1b1c4754fdf058f0835ee9..d99b19a25b15fbdda1087ed34bafb7760f06aa58 100644 (file)
--- a/drivers/staging/vt6655/desc.h
+++ b/drivers/staging/vt6655/desc.h
@@ -232,7 +232,8 @@ typedef struct tagDEVICE_RD_INFO {
 /*
 static inline PDEVICE_RD_INFO alloc_rd_info(void) {
     PDEVICE_RD_INFO  ptr;
-    if ((ptr = kmalloc(sizeof(DEVICE_RD_INFO), GFP_ATOMIC)) == NULL)
+    ptr = kmalloc(sizeof(DEVICE_RD_INFO), GFP_ATOMIC);
+    if (ptr == NULL)
         return NULL;
     else {
         memset(ptr,0,sizeof(DEVICE_RD_INFO));
@@ -256,11 +257,11 @@ SRDES0;
 typedef struct tagRDES0 {
    volatile WORD    wResCount;
        union {
-               volatile U16    f15Reserved;
+               volatile u16    f15Reserved;
                struct {
-            volatile U8 f8Reserved1;
-                       volatile U8 f1Owner:1;
-                       volatile U8 f7Reserved:7;
+            volatile u8 f8Reserved1;
+                       volatile u8 f1Owner:1;
+                       volatile u8 f7Reserved:7;
                } __attribute__ ((__packed__));
        } __attribute__ ((__packed__));
 } __attribute__ ((__packed__))
@@ -316,11 +317,11 @@ typedef struct tagTDES0 {
     volatile    BYTE    byTSR0;
     volatile    BYTE    byTSR1;
        union {
-               volatile U16    f15Txtime;
+               volatile u16    f15Txtime;
                struct {
-            volatile U8 f8Reserved1;
-                       volatile U8 f1Owner:1;
-                       volatile U8 f7Reserved:7;
+            volatile u8 f8Reserved1;
+                       volatile u8 f1Owner:1;
+                       volatile u8 f7Reserved:7;
                } __attribute__ ((__packed__));
        } __attribute__ ((__packed__));
 } __attribute__ ((__packed__))
@@ -361,7 +362,8 @@ typedef struct tagDEVICE_TD_INFO{
 /*
 static inline PDEVICE_TD_INFO alloc_td_info(void) {
     PDEVICE_TD_INFO  ptr;
-    if ((ptr = kmalloc(sizeof(DEVICE_TD_INFO),GFP_ATOMIC))==NULL)
+    ptr = kmalloc(sizeof(DEVICE_TD_INFO),GFP_ATOMIC);
+    if (ptr == NULL)
         return NULL;
     else {
         memset(ptr,0,sizeof(DEVICE_TD_INFO));
@@ -444,8 +446,8 @@ typedef const SRrvTime_atim *PCSRrvTime_atim;
 typedef struct tagSRTSData {
     WORD    wFrameControl;
     WORD    wDurationID;
-    BYTE    abyRA[U_ETHER_ADDR_LEN];
-    BYTE    abyTA[U_ETHER_ADDR_LEN];
+    BYTE    abyRA[ETH_ALEN];
+    BYTE    abyTA[ETH_ALEN];
 }__attribute__ ((__packed__))
 SRTSData, *PSRTSData;
 typedef const SRTSData *PCSRTSData;
@@ -520,7 +522,7 @@ typedef const SRTS_a_FB *PCSRTS_a_FB;
 typedef struct tagSCTSData {
     WORD    wFrameControl;
     WORD    wDurationID;
-    BYTE    abyRA[U_ETHER_ADDR_LEN];
+    BYTE    abyRA[ETH_ALEN];
     WORD    wReserved;
 }__attribute__ ((__packed__))
 SCTSData, *PSCTSData;