Merge branch 'master'

[linux-2.6.git] / drivers / scsi / libata-core.c

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index d8f248dd0d010b467b607a77b9064b981920a3d6..b1011f4b995ca733440bce2aa98b6656c0ccd00a 100644 (file)
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -2667,14 +2667,14 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)
  *     None.  (grabs host lock)
  */
 
  *     None.  (grabs host lock)
  */
 

-void ata_poll_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)
+void ata_poll_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask)

 {
        struct ata_port *ap = qc->ap;
        unsigned long flags;
 
        spin_lock_irqsave(&ap->host_set->lock, flags);
        ata_irq_on(ap);
 {
        struct ata_port *ap = qc->ap;
        unsigned long flags;
 
        spin_lock_irqsave(&ap->host_set->lock, flags);
        ata_irq_on(ap);

-       ata_qc_complete(qc, drv_stat);
+       ata_qc_complete(qc, err_mask);

        spin_unlock_irqrestore(&ap->host_set->lock, flags);
 }
 
        spin_unlock_irqrestore(&ap->host_set->lock, flags);
 }
 


@@ -2771,7 +2771,7 @@ static int ata_pio_complete (struct ata_port *ap)
 
        ap->hsm_task_state = HSM_ST_IDLE;
 
 
        ap->hsm_task_state = HSM_ST_IDLE;
 

-       ata_poll_qc_complete(qc, drv_stat);
+       ata_poll_qc_complete(qc, 0);

 
        /* another command may start at this point */
 
 
        /* another command may start at this point */
 


@@ -3266,18 +3266,15 @@ static void ata_pio_block(struct ata_port *ap)
 static void ata_pio_error(struct ata_port *ap)
 {
        struct ata_queued_cmd *qc;
 static void ata_pio_error(struct ata_port *ap)
 {
        struct ata_queued_cmd *qc;

-       u8 drv_stat;
+
+       printk(KERN_WARNING "ata%u: PIO error\n", ap->id);

 
        qc = ata_qc_from_tag(ap, ap->active_tag);
        assert(qc != NULL);
 
 
        qc = ata_qc_from_tag(ap, ap->active_tag);
        assert(qc != NULL);
 

-       drv_stat = ata_chk_status(ap);
-       printk(KERN_WARNING "ata%u: PIO error, drv_stat 0x%x\n",
-              ap->id, drv_stat);
-

        ap->hsm_task_state = HSM_ST_IDLE;
 
        ap->hsm_task_state = HSM_ST_IDLE;
 

-       ata_poll_qc_complete(qc, drv_stat | ATA_ERR);
+       ata_poll_qc_complete(qc, AC_ERR_ATA_BUS);

 }
 
 static void ata_pio_task(void *_data)
 }
 
 static void ata_pio_task(void *_data)


@@ -3402,7 +3399,7 @@ static void ata_qc_timeout(struct ata_queued_cmd *qc)
                ap->hsm_task_state = HSM_ST_IDLE;
 
                /* complete taskfile transaction */
                ap->hsm_task_state = HSM_ST_IDLE;
 
                /* complete taskfile transaction */

-               ata_qc_complete(qc, drv_stat);
+               ata_qc_complete(qc, ac_err_mask(drv_stat));

                break;
        }
 
                break;
        }
 


@@ -3507,7 +3504,7 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
        return qc;
 }
 
        return qc;
 }
 

-int ata_qc_complete_noop(struct ata_queued_cmd *qc, u8 drv_stat)
+int ata_qc_complete_noop(struct ata_queued_cmd *qc, unsigned int err_mask)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -3566,7 +3563,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
  *     spin_lock_irqsave(host_set lock)
  */
 
  *     spin_lock_irqsave(host_set lock)
  */
 

-void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)
+void ata_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask)

 {
        int rc;
 
 {
        int rc;
 


@@ -3583,7 +3580,7 @@ void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)
        qc->flags &= ~ATA_QCFLAG_ACTIVE;
 
        /* call completion callback */
        qc->flags &= ~ATA_QCFLAG_ACTIVE;
 
        /* call completion callback */

-       rc = qc->complete_fn(qc, drv_stat);
+       rc = qc->complete_fn(qc, err_mask);

 
        /* if callback indicates not to complete command (non-zero),
         * return immediately
 
        /* if callback indicates not to complete command (non-zero),
         * return immediately


@@ -4169,7 +4166,7 @@ fsm_start:
                ap->hsm_task_state = HSM_ST_IDLE;
 
                /* complete taskfile transaction */
                ap->hsm_task_state = HSM_ST_IDLE;
 
                /* complete taskfile transaction */

-               ata_qc_complete(qc, status);
+               ata_qc_complete(qc, ac_err_mask(status));

                break;
 
        case HSM_ST_ERR:
                break;
 
        case HSM_ST_ERR:


@@ -4746,11 +4743,11 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int
        return probe_ent;
 }
 
        return probe_ent;
 }
 

-static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, struct ata_port_info **port, int port_num)
+static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, struct ata_port_info *port, int port_num)

 {
        struct ata_probe_ent *probe_ent;
 
 {
        struct ata_probe_ent *probe_ent;
 

-       probe_ent = ata_probe_ent_alloc(pci_dev_to_dev(pdev), port[0]);
+       probe_ent = ata_probe_ent_alloc(pci_dev_to_dev(pdev), port);

        if (!probe_ent)
                return NULL;
 
        if (!probe_ent)
                return NULL;
 


@@ -4897,9 +4894,9 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
 
        if (legacy_mode) {
                if (legacy_mode & (1 << 0))
 
        if (legacy_mode) {
                if (legacy_mode & (1 << 0))

-                       probe_ent = ata_pci_init_legacy_port(pdev, port, 0);
+                       probe_ent = ata_pci_init_legacy_port(pdev, port[0], 0);

                if (legacy_mode & (1 << 1))
                if (legacy_mode & (1 << 1))

-                       probe_ent2 = ata_pci_init_legacy_port(pdev, port, 1);
+                       probe_ent2 = ata_pci_init_legacy_port(pdev, port[1], 1);

        } else {
                if (n_ports == 2)
                        probe_ent = ata_pci_init_native_mode(pdev, port, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
        } else {
                if (n_ports == 2)
                        probe_ent = ata_pci_init_native_mode(pdev, port, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);