diff options
-rw-r--r-- | drivers/ata/sata_fsl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index 03629b687de4..5892472a5681 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c | |||
@@ -269,7 +269,7 @@ struct sata_fsl_host_priv { | |||
269 | }; | 269 | }; |
270 | 270 | ||
271 | static inline unsigned int sata_fsl_tag(unsigned int tag, | 271 | static inline unsigned int sata_fsl_tag(unsigned int tag, |
272 | void __iomem * hcr_base) | 272 | void __iomem *hcr_base) |
273 | { | 273 | { |
274 | /* We let libATA core do actual (queue) tag allocation */ | 274 | /* We let libATA core do actual (queue) tag allocation */ |
275 | 275 | ||
@@ -308,7 +308,7 @@ static void sata_fsl_setup_cmd_hdr_entry(struct sata_fsl_port_priv *pp, | |||
308 | pp->cmdslot[tag].prde_fis_len = | 308 | pp->cmdslot[tag].prde_fis_len = |
309 | cpu_to_le32((num_prde << 16) | (fis_len << 2)); | 309 | cpu_to_le32((num_prde << 16) | (fis_len << 2)); |
310 | pp->cmdslot[tag].ttl = cpu_to_le32(data_xfer_len & ~0x03); | 310 | pp->cmdslot[tag].ttl = cpu_to_le32(data_xfer_len & ~0x03); |
311 | pp->cmdslot[tag].desc_info = cpu_to_le32((desc_info | (tag & 0x1F))); | 311 | pp->cmdslot[tag].desc_info = cpu_to_le32(desc_info | (tag & 0x1F)); |
312 | 312 | ||
313 | VPRINTK("cda=0x%x, prde_fis_len=0x%x, ttl=0x%x, di=0x%x\n", | 313 | VPRINTK("cda=0x%x, prde_fis_len=0x%x, ttl=0x%x, di=0x%x\n", |
314 | pp->cmdslot[tag].cda, | 314 | pp->cmdslot[tag].cda, |
@@ -318,7 +318,7 @@ static void sata_fsl_setup_cmd_hdr_entry(struct sata_fsl_port_priv *pp, | |||
318 | } | 318 | } |
319 | 319 | ||
320 | static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc, | 320 | static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc, |
321 | u32 * ttl, dma_addr_t cmd_desc_paddr) | 321 | u32 *ttl, dma_addr_t cmd_desc_paddr) |
322 | { | 322 | { |
323 | struct scatterlist *sg; | 323 | struct scatterlist *sg; |
324 | unsigned int num_prde = 0; | 324 | unsigned int num_prde = 0; |
@@ -406,7 +406,7 @@ static void sata_fsl_qc_prep(struct ata_queued_cmd *qc) | |||
406 | cd = (struct command_desc *)pp->cmdentry + tag; | 406 | cd = (struct command_desc *)pp->cmdentry + tag; |
407 | cd_paddr = pp->cmdentry_paddr + tag * SATA_FSL_CMD_DESC_SIZE; | 407 | cd_paddr = pp->cmdentry_paddr + tag * SATA_FSL_CMD_DESC_SIZE; |
408 | 408 | ||
409 | ata_tf_to_fis(&qc->tf, 0, 1, (u8 *) & cd->cfis); | 409 | ata_tf_to_fis(&qc->tf, 0, 1, (u8 *) &cd->cfis); |
410 | 410 | ||
411 | VPRINTK("Dumping cfis : 0x%x, 0x%x, 0x%x\n", | 411 | VPRINTK("Dumping cfis : 0x%x, 0x%x, 0x%x\n", |
412 | cd->cfis[0], cd->cfis[1], cd->cfis[2]); | 412 | cd->cfis[0], cd->cfis[1], cd->cfis[2]); |
@@ -837,7 +837,7 @@ try_offline_again: | |||
837 | DPRINTK("Sending SRST/device reset\n"); | 837 | DPRINTK("Sending SRST/device reset\n"); |
838 | 838 | ||
839 | ata_tf_init(link->device, &tf); | 839 | ata_tf_init(link->device, &tf); |
840 | cfis = (u8 *) & pp->cmdentry->cfis; | 840 | cfis = (u8 *) &pp->cmdentry->cfis; |
841 | 841 | ||
842 | /* device reset/SRST is a control register update FIS, uses tag0 */ | 842 | /* device reset/SRST is a control register update FIS, uses tag0 */ |
843 | sata_fsl_setup_cmd_hdr_entry(pp, 0, | 843 | sata_fsl_setup_cmd_hdr_entry(pp, 0, |
@@ -963,7 +963,7 @@ skip_srst_do_ncq_error_handling: | |||
963 | 963 | ||
964 | iowrite32(0x01, CC + hcr_base); /* We know it will be cmd#0 always */ | 964 | iowrite32(0x01, CC + hcr_base); /* We know it will be cmd#0 always */ |
965 | 965 | ||
966 | check_device_signature: | 966 | check_device_signature: |
967 | 967 | ||
968 | DPRINTK("SATA FSL : Now checking device signature\n"); | 968 | DPRINTK("SATA FSL : Now checking device signature\n"); |
969 | 969 | ||