aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_sx4.c
diff options
context:
space:
mode:
authorAl Viro <viro@ZenIV.linux.org.uk>2007-12-30 04:32:22 -0500
committerJeff Garzik <jeff@garzik.org>2008-01-23 05:24:15 -0500
commit4ca4e439640cd1d3659cbcf60e7a73c2ae0450b3 (patch)
tree659dceb7469341dca95d7a96774e787c3b510872 /drivers/ata/sata_sx4.c
parent35a10a80daa04b7316d6bac1b1402cc347c35b1e (diff)
libata annotations and fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/sata_sx4.c')
-rw-r--r--drivers/ata/sata_sx4.c9
1 files changed, 5 insertions, 4 deletions
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,
334{ 334{
335 u32 addr; 335 u32 addr;
336 unsigned int dw = PDC_DIMM_APKT_PRD >> 2; 336 unsigned int dw = PDC_DIMM_APKT_PRD >> 2;
337 u32 *buf32 = (u32 *) buf; 337 __le32 *buf32 = (__le32 *) buf;
338 338
339 /* output ATA packet S/G table */ 339 /* output ATA packet S/G table */
340 addr = PDC_20621_DIMM_BASE + PDC_20621_DIMM_DATA + 340 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,
356{ 356{
357 u32 addr; 357 u32 addr;
358 unsigned int dw = PDC_DIMM_HPKT_PRD >> 2; 358 unsigned int dw = PDC_DIMM_HPKT_PRD >> 2;
359 u32 *buf32 = (u32 *) buf; 359 __le32 *buf32 = (__le32 *) buf;
360 360
361 /* output Host DMA packet S/G table */ 361 /* output Host DMA packet S/G table */
362 addr = PDC_20621_DIMM_BASE + PDC_20621_DIMM_DATA + 362 addr = PDC_20621_DIMM_BASE + PDC_20621_DIMM_DATA +
@@ -377,7 +377,7 @@ static inline unsigned int pdc20621_ata_pkt(struct ata_taskfile *tf,
377 unsigned int portno) 377 unsigned int portno)
378{ 378{
379 unsigned int i, dw; 379 unsigned int i, dw;
380 u32 *buf32 = (u32 *) buf; 380 __le32 *buf32 = (__le32 *) buf;
381 u8 dev_reg; 381 u8 dev_reg;
382 382
383 unsigned int dimm_sg = PDC_20621_DIMM_BASE + 383 unsigned int dimm_sg = PDC_20621_DIMM_BASE +
@@ -429,7 +429,8 @@ static inline void pdc20621_host_pkt(struct ata_taskfile *tf, u8 *buf,
429 unsigned int portno) 429 unsigned int portno)
430{ 430{
431 unsigned int dw; 431 unsigned int dw;
432 u32 tmp, *buf32 = (u32 *) buf; 432 u32 tmp;
433 __le32 *buf32 = (__le32 *) buf;
433 434
434 unsigned int host_sg = PDC_20621_DIMM_BASE + 435 unsigned int host_sg = PDC_20621_DIMM_BASE +
435 (PDC_DIMM_WINDOW_STEP * portno) + 436 (PDC_DIMM_WINDOW_STEP * portno) +