libata annotations and fixes

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

7 files changed, 20 insertions, 19 deletions

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index cffad07c65bf..49761bc12cf2 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -198,18 +198,18 @@ enum {
 };
 
 struct ahci_cmd_hdr {
-        u32                     opts;
-        u32                     status;
-        u32                     tbl_addr;
-        u32                     tbl_addr_hi;
-        u32                     reserved[4];
+        __le32                  opts;
+        __le32                  status;
+        __le32                  tbl_addr;
+        __le32                  tbl_addr_hi;
+        __le32                  reserved[4];
 };
 
 struct ahci_sg {
-        u32                     addr;
-        u32                     addr_hi;
-        u32                     reserved;
-        u32                     flags_size;
+        __le32                  addr;
+        __le32                  addr_hi;
+        __le32                  reserved;
+        __le32                  flags_size;
 };
 
 struct ahci_host_priv {
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 4020a1d3eb2c..8c82193b077e 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4949,7 +4949,7 @@ unsigned int ata_data_xfer(struct ata_device *dev, unsigned char *buf,
 
         /* Transfer trailing 1 byte, if any. */
         if (unlikely(buflen & 0x01)) {
-                u16 align_buf[1] = { 0 };
+                __le16 align_buf[1] = { 0 };
                 unsigned char *trailing_buf = buf + buflen - 1;
 
                 if (rw == READ) {
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 42bf61599730..15a4c8a20358 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2210,7 +2210,7 @@ unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf,
 
                 /* sector size */
                 ATA_SCSI_RBUF_SET(6, ATA_SECT_SIZE >> 8);
-                ATA_SCSI_RBUF_SET(7, ATA_SECT_SIZE);
+                ATA_SCSI_RBUF_SET(7, ATA_SECT_SIZE & 0xff);
         } else {
                 /* sector count, 64-bit */
                 ATA_SCSI_RBUF_SET(0, last_lba >> (8 * 7));
@@ -2224,7 +2224,7 @@ unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf,
 
                 /* sector size */
                 ATA_SCSI_RBUF_SET(10, ATA_SECT_SIZE >> 8);
-                ATA_SCSI_RBUF_SET(11, ATA_SECT_SIZE);
+                ATA_SCSI_RBUF_SET(11, ATA_SECT_SIZE & 0xff);
         }
 
         return 0;
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 33f7f0843f4f..d4590f546c49 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -198,7 +198,7 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi
         };
         const struct ata_port_info *ppi[2];
         u8 pcicfg;
-        void *iomap[5];
+        void __iomem *iomap[5];
         struct ata_host *host;
         struct ata_ioports *ioaddr;
         int i, rc;
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 2622577521a1..028af5dbeed6 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -348,7 +348,7 @@ static unsigned long pdc2027x_mode_filter(struct ata_device *adev, unsigned long
         ata_id_c_string(pair->id, model_num, ATA_ID_PROD,
                           ATA_ID_PROD_LEN + 1);
         /* If the master is a maxtor in UDMA6 then the slave should not use UDMA 6 */
-        if (strstr(model_num, "Maxtor") == 0 && pair->dma_mode == XFER_UDMA_6)
+        if (strstr(model_num, "Maxtor") == NULL && pair->dma_mode == XFER_UDMA_6)
                 mask &= ~ (1 << (6 + ATA_SHIFT_UDMA));
 
         return ata_pci_default_filter(adev, mask);
diff --git a/drivers/ata/sata_promise.h b/drivers/ata/sata_promise.h
index 6ee5e190262d..00d6000e546f 100644
--- a/drivers/ata/sata_promise.h
+++ b/drivers/ata/sata_promise.h
@@ -46,7 +46,7 @@ static inline unsigned int pdc_pkt_header(struct ata_taskfile *tf,
                                           unsigned int devno, u8 *buf)
 {
         u8 dev_reg;
-        u32 *buf32 = (u32 *) buf;
+        __le32 *buf32 = (__le32 *) buf;
 
         /* set control bits (byte 0), zero delay seq id (byte 3),
          * and seq id (byte 2)
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 211ba8da64f4..e3d56bc6726d 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -334,7 +334,7 @@ static inline void pdc20621_ata_sg(struct ata_taskfile *tf, u8 *buf,
 {
         u32 addr;
         unsigned int dw = PDC_DIMM_APKT_PRD >> 2;
-        u32 *buf32 = (u32 *) buf;
+        __le32 *buf32 = (__le32 *) buf;
 
         /* output ATA packet S/G table */
         addr = PDC_20621_DIMM_BASE + PDC_20621_DIMM_DATA +
@@ -356,7 +356,7 @@ static inline void pdc20621_host_sg(struct ata_taskfile *tf, u8 *buf,
 {
         u32 addr;
         unsigned int dw = PDC_DIMM_HPKT_PRD >> 2;
-        u32 *buf32 = (u32 *) buf;
+        __le32 *buf32 = (__le32 *) buf;
 
         /* output Host DMA packet S/G table */
         addr = PDC_20621_DIMM_BASE + PDC_20621_DIMM_DATA +
@@ -377,7 +377,7 @@ static inline unsigned int pdc20621_ata_pkt(struct ata_taskfile *tf,
                                             unsigned int portno)
 {
         unsigned int i, dw;
-        u32 *buf32 = (u32 *) buf;
+        __le32 *buf32 = (__le32 *) buf;
         u8 dev_reg;
 
         unsigned int dimm_sg = PDC_20621_DIMM_BASE +
@@ -429,7 +429,8 @@ static inline void pdc20621_host_pkt(struct ata_taskfile *tf, u8 *buf,
                                      unsigned int portno)
 {
         unsigned int dw;
-        u32 tmp, *buf32 = (u32 *) buf;
+        u32 tmp;
+        __le32 *buf32 = (__le32 *) buf;
 
         unsigned int host_sg = PDC_20621_DIMM_BASE +
                                (PDC_DIMM_WINDOW_STEP * portno) +