Merge branch 'for-4.7-zac' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[cascardo/linux.git] / drivers / staging / fwserial / dma_fifo.h

diff --git a/drivers/staging/fwserial/dma_fifo.h b/drivers/staging/fwserial/dma_fifo.h
index 4109882..37a91c6 100644 (file)
--- a/drivers/staging/fwserial/dma_fifo.h
+++ b/drivers/staging/fwserial/dma_fifo.h
@@ -45,9 +45,9 @@
 #define DMA_FIFO_GUARD 3   /* # of cache lines to reserve for the guard area */
 
 struct dma_fifo {
-       unsigned         in;
-       unsigned         out;           /* updated when dma is pended         */
-       unsigned         done;          /* updated upon dma completion        */
+       unsigned int     in;
+       unsigned int     out;           /* updated when dma is pended         */
+       unsigned int     done;          /* updated upon dma completion        */
        struct {
                unsigned corrupt:1;
        };
@@ -55,7 +55,7 @@ struct dma_fifo {
        int              guard;         /* ofs of guard area                  */
        int              capacity;      /* size + reserved                    */
        int              avail;         /* # of unused bytes in fifo          */
-       unsigned         align;         /* must be power of 2                 */
+       unsigned int     align;         /* must be power of 2                 */
        int              tx_limit;      /* max # of bytes per dma transaction */
        int              open_limit;    /* max # of outstanding allowed       */
        int              open;          /* # of outstanding dma transactions  */
@@ -66,9 +66,9 @@ struct dma_fifo {
 struct dma_pending {
        struct list_head link;
        void             *data;
-       unsigned         len;
-       unsigned         next;
-       unsigned         out;
+       unsigned int     len;
+       unsigned int     next;
+       unsigned int     out;
 };
 
 static inline void dp_mark_completed(struct dma_pending *dp)
@@ -82,7 +82,7 @@ static inline bool dp_is_completed(struct dma_pending *dp)
 }
 
 void dma_fifo_init(struct dma_fifo *fifo);
-int dma_fifo_alloc(struct dma_fifo *fifo, int size, unsigned align,
+int dma_fifo_alloc(struct dma_fifo *fifo, int size, unsigned int align,
                   int tx_limit, int open_limit, gfp_t gfp_mask);
 void dma_fifo_free(struct dma_fifo *fifo);
 void dma_fifo_reset(struct dma_fifo *fifo);