1 files changed, 14 insertions, 12 deletions

diff --git a/drivers/net/ethernet/altera/altera_sgdmahw.h b/drivers/net/ethernet/altera/altera_sgdmahw.h
index ba3334f35383..85bc33b218d9 100644
--- a/drivers/net/ethernet/altera/altera_sgdmahw.h
+++ b/drivers/net/ethernet/altera/altera_sgdmahw.h
@@ -19,16 +19,16 @@
 
 /* SGDMA descriptor structure */
 struct sgdma_descrip {
-        unsigned int    raddr; /* address of data to be read */
-        unsigned int    pad1;
-        unsigned int    waddr;
-        unsigned int    pad2;
-        unsigned int    next;
-        unsigned int    pad3;
-        unsigned short  bytes;
-        unsigned char   rburst;
-        unsigned char   wburst;
-        unsigned short  bytes_xferred;  /* 16 bits, bytes xferred */
+        u32     raddr; /* address of data to be read */
+        u32     pad1;
+        u32     waddr;
+        u32     pad2;
+        u32     next;
+        u32     pad3;
+        u16     bytes;
+        u8      rburst;
+        u8      wburst;
+        u16     bytes_xferred;  /* 16 bits, bytes xferred */
 
         /* bit 0: error
          * bit 1: length error
@@ -39,7 +39,7 @@ struct sgdma_descrip {
          * bit 6: reserved
          * bit 7: status eop for recv case
          */
-        unsigned char   status;
+        u8      status;
 
         /* bit 0: eop
          * bit 1: read_fixed
@@ -47,7 +47,7 @@ struct sgdma_descrip {
          * bits 3,4,5,6: Channel (always 0)
          * bit 7: hardware owned
          */
-        unsigned char   control;
+        u8      control;
 } __packed;
 
 
@@ -101,6 +101,8 @@ struct sgdma_csr {
         u32     pad3[3];
 };
 
+#define sgdma_csroffs(a) (offsetof(struct sgdma_csr, a))
+#define sgdma_descroffs(a) (offsetof(struct sgdma_descrip, a))
 
 #define SGDMA_STSREG_ERR        BIT(0) /* Error */
 #define SGDMA_STSREG_EOP        BIT(1) /* EOP */