aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_sx4.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/sata_sx4.c')
-rw-r--r--drivers/ata/sata_sx4.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 0ebd77b080d6..1a081c3a8c06 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -44,7 +44,7 @@
44#include "sata_promise.h" 44#include "sata_promise.h"
45 45
46#define DRV_NAME "sata_sx4" 46#define DRV_NAME "sata_sx4"
47#define DRV_VERSION "0.9" 47#define DRV_VERSION "0.10"
48 48
49 49
50enum { 50enum {
@@ -421,7 +421,7 @@ static void pdc20621_dma_prep(struct ata_queued_cmd *qc)
421 421
422 WARN_ON(!(qc->flags & ATA_QCFLAG_DMAMAP)); 422 WARN_ON(!(qc->flags & ATA_QCFLAG_DMAMAP));
423 423
424 VPRINTK("ata%u: ENTER\n", ap->id); 424 VPRINTK("ata%u: ENTER\n", ap->print_id);
425 425
426 /* hard-code chip #0 */ 426 /* hard-code chip #0 */
427 mmio += PDC_CHIP0_OFS; 427 mmio += PDC_CHIP0_OFS;
@@ -478,7 +478,7 @@ static void pdc20621_nodata_prep(struct ata_queued_cmd *qc)
478 unsigned int portno = ap->port_no; 478 unsigned int portno = ap->port_no;
479 unsigned int i; 479 unsigned int i;
480 480
481 VPRINTK("ata%u: ENTER\n", ap->id); 481 VPRINTK("ata%u: ENTER\n", ap->print_id);
482 482
483 /* hard-code chip #0 */ 483 /* hard-code chip #0 */
484 mmio += PDC_CHIP0_OFS; 484 mmio += PDC_CHIP0_OFS;
@@ -605,7 +605,7 @@ static void pdc20621_packet_start(struct ata_queued_cmd *qc)
605 /* hard-code chip #0 */ 605 /* hard-code chip #0 */
606 mmio += PDC_CHIP0_OFS; 606 mmio += PDC_CHIP0_OFS;
607 607
608 VPRINTK("ata%u: ENTER\n", ap->id); 608 VPRINTK("ata%u: ENTER\n", ap->print_id);
609 609
610 wmb(); /* flush PRD, pkt writes */ 610 wmb(); /* flush PRD, pkt writes */
611 611
@@ -672,7 +672,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
672 672
673 /* step two - DMA from DIMM to host */ 673 /* step two - DMA from DIMM to host */
674 if (doing_hdma) { 674 if (doing_hdma) {
675 VPRINTK("ata%u: read hdma, 0x%x 0x%x\n", ap->id, 675 VPRINTK("ata%u: read hdma, 0x%x 0x%x\n", ap->print_id,
676 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT)); 676 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT));
677 /* get drive status; clear intr; complete txn */ 677 /* get drive status; clear intr; complete txn */
678 qc->err_mask |= ac_err_mask(ata_wait_idle(ap)); 678 qc->err_mask |= ac_err_mask(ata_wait_idle(ap));
@@ -683,7 +683,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
683 /* step one - exec ATA command */ 683 /* step one - exec ATA command */
684 else { 684 else {
685 u8 seq = (u8) (port_no + 1 + 4); 685 u8 seq = (u8) (port_no + 1 + 4);
686 VPRINTK("ata%u: read ata, 0x%x 0x%x\n", ap->id, 686 VPRINTK("ata%u: read ata, 0x%x 0x%x\n", ap->print_id,
687 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT)); 687 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT));
688 688
689 /* submit hdma pkt */ 689 /* submit hdma pkt */
@@ -698,7 +698,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
698 /* step one - DMA from host to DIMM */ 698 /* step one - DMA from host to DIMM */
699 if (doing_hdma) { 699 if (doing_hdma) {
700 u8 seq = (u8) (port_no + 1); 700 u8 seq = (u8) (port_no + 1);
701 VPRINTK("ata%u: write hdma, 0x%x 0x%x\n", ap->id, 701 VPRINTK("ata%u: write hdma, 0x%x 0x%x\n", ap->print_id,
702 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT)); 702 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT));
703 703
704 /* submit ata pkt */ 704 /* submit ata pkt */
@@ -711,7 +711,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
711 711
712 /* step two - execute ATA command */ 712 /* step two - execute ATA command */
713 else { 713 else {
714 VPRINTK("ata%u: write ata, 0x%x 0x%x\n", ap->id, 714 VPRINTK("ata%u: write ata, 0x%x 0x%x\n", ap->print_id,
715 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT)); 715 readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT));
716 /* get drive status; clear intr; complete txn */ 716 /* get drive status; clear intr; complete txn */
717 qc->err_mask |= ac_err_mask(ata_wait_idle(ap)); 717 qc->err_mask |= ac_err_mask(ata_wait_idle(ap));