mirror of
https://github.com/torvalds/linux.git
synced 2024-09-25 09:23:11 +00:00
libata annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
9c0bf67505
commit
826cd156de
|
@ -782,28 +782,28 @@ static unsigned int scc_data_xfer (struct ata_device *dev, unsigned char *buf,
|
||||||
struct ata_port *ap = dev->link->ap;
|
struct ata_port *ap = dev->link->ap;
|
||||||
unsigned int words = buflen >> 1;
|
unsigned int words = buflen >> 1;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
u16 *buf16 = (u16 *) buf;
|
__le16 *buf16 = (__le16 *) buf;
|
||||||
void __iomem *mmio = ap->ioaddr.data_addr;
|
void __iomem *mmio = ap->ioaddr.data_addr;
|
||||||
|
|
||||||
/* Transfer multiple of 2 bytes */
|
/* Transfer multiple of 2 bytes */
|
||||||
if (rw == READ)
|
if (rw == READ)
|
||||||
for (i = 0; i < words; i++)
|
for (i = 0; i < words; i++)
|
||||||
buf16[i] = le16_to_cpu(in_be32(mmio));
|
buf16[i] = cpu_to_le16(in_be32(mmio));
|
||||||
else
|
else
|
||||||
for (i = 0; i < words; i++)
|
for (i = 0; i < words; i++)
|
||||||
out_be32(mmio, cpu_to_le16(buf16[i]));
|
out_be32(mmio, le16_to_cpu(buf16[i]));
|
||||||
|
|
||||||
/* Transfer trailing 1 byte, if any. */
|
/* Transfer trailing 1 byte, if any. */
|
||||||
if (unlikely(buflen & 0x01)) {
|
if (unlikely(buflen & 0x01)) {
|
||||||
u16 align_buf[1] = { 0 };
|
__le16 align_buf[1] = { 0 };
|
||||||
unsigned char *trailing_buf = buf + buflen - 1;
|
unsigned char *trailing_buf = buf + buflen - 1;
|
||||||
|
|
||||||
if (rw == READ) {
|
if (rw == READ) {
|
||||||
align_buf[0] = le16_to_cpu(in_be32(mmio));
|
align_buf[0] = cpu_to_le16(in_be32(mmio));
|
||||||
memcpy(trailing_buf, align_buf, 1);
|
memcpy(trailing_buf, align_buf, 1);
|
||||||
} else {
|
} else {
|
||||||
memcpy(align_buf, trailing_buf, 1);
|
memcpy(align_buf, trailing_buf, 1);
|
||||||
out_be32(mmio, cpu_to_le16(align_buf[0]));
|
out_be32(mmio, le16_to_cpu(align_buf[0]));
|
||||||
}
|
}
|
||||||
words++;
|
words++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -405,7 +405,7 @@ static void pdc_atapi_pkt(struct ata_queued_cmd *qc)
|
||||||
u8 *cdb = qc->cdb;
|
u8 *cdb = qc->cdb;
|
||||||
struct pdc_port_priv *pp = ap->private_data;
|
struct pdc_port_priv *pp = ap->private_data;
|
||||||
u8 *buf = pp->pkt;
|
u8 *buf = pp->pkt;
|
||||||
u32 *buf32 = (u32 *) buf;
|
__le32 *buf32 = (__le32 *) buf;
|
||||||
unsigned int dev_sel, feature;
|
unsigned int dev_sel, feature;
|
||||||
|
|
||||||
/* set control bits (byte 0), zero delay seq id (byte 3),
|
/* set control bits (byte 0), zero delay seq id (byte 3),
|
||||||
|
|
|
@ -464,7 +464,7 @@ static void pdc20621_dma_prep(struct ata_queued_cmd *qc)
|
||||||
void __iomem *dimm_mmio = ap->host->iomap[PDC_DIMM_BAR];
|
void __iomem *dimm_mmio = ap->host->iomap[PDC_DIMM_BAR];
|
||||||
unsigned int portno = ap->port_no;
|
unsigned int portno = ap->port_no;
|
||||||
unsigned int i, si, idx, total_len = 0, sgt_len;
|
unsigned int i, si, idx, total_len = 0, sgt_len;
|
||||||
u32 *buf = (u32 *) &pp->dimm_buf[PDC_DIMM_HEADER_SZ];
|
__le32 *buf = (__le32 *) &pp->dimm_buf[PDC_DIMM_HEADER_SZ];
|
||||||
|
|
||||||
WARN_ON(!(qc->flags & ATA_QCFLAG_DMAMAP));
|
WARN_ON(!(qc->flags & ATA_QCFLAG_DMAMAP));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user