diff options
| -rw-r--r-- | drivers/scsi/sata_mv.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index bf3529fdea9c..624983c2e24b 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c | |||
| @@ -272,33 +272,33 @@ enum chip_type { | |||
| 272 | 272 | ||
| 273 | /* Command ReQuest Block: 32B */ | 273 | /* Command ReQuest Block: 32B */ |
| 274 | struct mv_crqb { | 274 | struct mv_crqb { |
| 275 | u32 sg_addr; | 275 | __le32 sg_addr; |
| 276 | u32 sg_addr_hi; | 276 | __le32 sg_addr_hi; |
| 277 | u16 ctrl_flags; | 277 | __le16 ctrl_flags; |
| 278 | u16 ata_cmd[11]; | 278 | __le16 ata_cmd[11]; |
| 279 | }; | 279 | }; |
| 280 | 280 | ||
| 281 | struct mv_crqb_iie { | 281 | struct mv_crqb_iie { |
| 282 | u32 addr; | 282 | __le32 addr; |
| 283 | u32 addr_hi; | 283 | __le32 addr_hi; |
| 284 | u32 flags; | 284 | __le32 flags; |
| 285 | u32 len; | 285 | __le32 len; |
| 286 | u32 ata_cmd[4]; | 286 | __le32 ata_cmd[4]; |
| 287 | }; | 287 | }; |
| 288 | 288 | ||
| 289 | /* Command ResPonse Block: 8B */ | 289 | /* Command ResPonse Block: 8B */ |
| 290 | struct mv_crpb { | 290 | struct mv_crpb { |
| 291 | u16 id; | 291 | __le16 id; |
| 292 | u16 flags; | 292 | __le16 flags; |
| 293 | u32 tmstmp; | 293 | __le32 tmstmp; |
| 294 | }; | 294 | }; |
| 295 | 295 | ||
| 296 | /* EDMA Physical Region Descriptor (ePRD); A.K.A. SG */ | 296 | /* EDMA Physical Region Descriptor (ePRD); A.K.A. SG */ |
| 297 | struct mv_sg { | 297 | struct mv_sg { |
| 298 | u32 addr; | 298 | __le32 addr; |
| 299 | u32 flags_size; | 299 | __le32 flags_size; |
| 300 | u32 addr_hi; | 300 | __le32 addr_hi; |
| 301 | u32 reserved; | 301 | __le32 reserved; |
| 302 | }; | 302 | }; |
| 303 | 303 | ||
| 304 | struct mv_port_priv { | 304 | struct mv_port_priv { |
| @@ -1030,7 +1030,7 @@ static inline unsigned mv_inc_q_index(unsigned index) | |||
| 1030 | return (index + 1) & MV_MAX_Q_DEPTH_MASK; | 1030 | return (index + 1) & MV_MAX_Q_DEPTH_MASK; |
| 1031 | } | 1031 | } |
| 1032 | 1032 | ||
| 1033 | static inline void mv_crqb_pack_cmd(u16 *cmdw, u8 data, u8 addr, unsigned last) | 1033 | static inline void mv_crqb_pack_cmd(__le16 *cmdw, u8 data, u8 addr, unsigned last) |
| 1034 | { | 1034 | { |
| 1035 | u16 tmp = data | (addr << CRQB_CMD_ADDR_SHIFT) | CRQB_CMD_CS | | 1035 | u16 tmp = data | (addr << CRQB_CMD_ADDR_SHIFT) | CRQB_CMD_CS | |
| 1036 | (last ? CRQB_CMD_LAST : 0); | 1036 | (last ? CRQB_CMD_LAST : 0); |
| @@ -1053,7 +1053,7 @@ static void mv_qc_prep(struct ata_queued_cmd *qc) | |||
| 1053 | { | 1053 | { |
| 1054 | struct ata_port *ap = qc->ap; | 1054 | struct ata_port *ap = qc->ap; |
| 1055 | struct mv_port_priv *pp = ap->private_data; | 1055 | struct mv_port_priv *pp = ap->private_data; |
| 1056 | u16 *cw; | 1056 | __le16 *cw; |
| 1057 | struct ata_taskfile *tf; | 1057 | struct ata_taskfile *tf; |
| 1058 | u16 flags = 0; | 1058 | u16 flags = 0; |
| 1059 | unsigned in_index; | 1059 | unsigned in_index; |
