1 files changed, 29 insertions, 29 deletions

diff --git a/include/linux/bsg.h b/include/linux/bsg.h
index 0d212cc06abf..f968726cfadc 100644
--- a/include/linux/bsg.h
+++ b/include/linux/bsg.h
@@ -2,42 +2,42 @@
 #define BSG_H
 
 struct sg_io_v4 {
-        int32_t guard;          /* [i] 'Q' to differentiate from v3 */
-        uint32_t protocol;      /* [i] 0 -> SCSI , .... */
-        uint32_t subprotocol;   /* [i] 0 -> SCSI command, 1 -> SCSI task
+        s32 guard;              /* [i] 'Q' to differentiate from v3 */
+        u32 protocol;           /* [i] 0 -> SCSI , .... */
+        u32 subprotocol;        /* [i] 0 -> SCSI command, 1 -> SCSI task
                                    management function, .... */
 
-        uint32_t request_len;   /* [i] in bytes */
-        uint64_t request;       /* [i], [*i] {SCSI: cdb} */
-        uint32_t request_attr;  /* [i] {SCSI: task attribute} */
-        uint32_t request_tag;   /* [i] {SCSI: task tag (only if flagged)} */
-        uint32_t request_priority;      /* [i] {SCSI: task priority} */
-        uint32_t max_response_len;      /* [i] in bytes */
-        uint64_t response;      /* [i], [*o] {SCSI: (auto)sense data} */
+        u32 request_len;        /* [i] in bytes */
+        u64 request;            /* [i], [*i] {SCSI: cdb} */
+        u32 request_attr;       /* [i] {SCSI: task attribute} */
+        u32 request_tag;        /* [i] {SCSI: task tag (only if flagged)} */
+        u32 request_priority;   /* [i] {SCSI: task priority} */
+        u32 max_response_len;   /* [i] in bytes */
+        u64 response;           /* [i], [*o] {SCSI: (auto)sense data} */
 
         /* "din_" for data in (from device); "dout_" for data out (to device) */
-        uint32_t dout_xfer_len; /* [i] bytes to be transferred to device */
-        uint32_t din_xfer_len;  /* [i] bytes to be transferred from device */
-        uint64_t dout_xferp;    /* [i], [*i] */
-        uint64_t din_xferp;     /* [i], [*o] */
+        u32 dout_xfer_len;      /* [i] bytes to be transferred to device */
+        u32 din_xfer_len;       /* [i] bytes to be transferred from device */
+        u64 dout_xferp;         /* [i], [*i] */
+        u64 din_xferp;          /* [i], [*o] */
 
-        uint32_t timeout;       /* [i] units: millisecond */
-        uint32_t flags;         /* [i] bit mask */
-        uint64_t usr_ptr;       /* [i->o] unused internally */
-        uint32_t spare_in;      /* [i] */
+        u32 timeout;            /* [i] units: millisecond */
+        u32 flags;              /* [i] bit mask */
+        u64 usr_ptr;            /* [i->o] unused internally */
+        u32 spare_in;           /* [i] */
 
-        uint32_t driver_status; /* [o] 0 -> ok */
-        uint32_t transport_status;      /* [o] 0 -> ok */
-        uint32_t device_status; /* [o] {SCSI: command completion status} */
-        uint32_t retry_delay;   /* [o] {SCSI: status auxiliary information} */
-        uint32_t info;          /* [o] additional information */
-        uint32_t duration;      /* [o] time to complete, in milliseconds */
-        uint32_t response_len;  /* [o] bytes of response actually written */
-        int32_t din_resid;      /* [o] actual_din_xfer_len - din_xfer_len */
-        uint32_t generated_tag; /* [o] {SCSI: task tag that transport chose} */
-        uint32_t spare_out;     /* [o] */
+        u32 driver_status;      /* [o] 0 -> ok */
+        u32 transport_status;   /* [o] 0 -> ok */
+        u32 device_status;      /* [o] {SCSI: command completion status} */
+        u32 retry_delay;        /* [o] {SCSI: status auxiliary information} */
+        u32 info;               /* [o] additional information */
+        u32 duration;           /* [o] time to complete, in milliseconds */
+        u32 response_len;       /* [o] bytes of response actually written */
+        s32 din_resid;          /* [o] actual_din_xfer_len - din_xfer_len */
+        u32 generated_tag;      /* [o] {SCSI: task tag that transport chose} */
+        u32 spare_out;          /* [o] */
 
-        uint32_t padding;
+        u32 padding;
 };
 
 #ifdef __KERNEL__