9 files changed, 71 insertions, 69 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 0b243e072e4..3e161cd6646 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -732,7 +732,7 @@ config SCSI_GDTH
           This is a driver for RAID/SCSI Disk Array Controllers (EISA/ISA/PCI) 
           manufactured by Intel Corporation/ICP vortex GmbH. It is documented
           in the kernel source in <file:drivers/scsi/gdth.c> and
-          <file:drivers/scsi/gdth.h.>
+          <file:drivers/scsi/gdth.h>.
 
           To compile this driver as a module, choose M here: the
           module will be called gdth.
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 492702ba646..374ed025dc5 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -13906,7 +13906,7 @@ static int advansys_release(struct Scsi_Host *shost)
 
 #define ASC_IOADR_TABLE_MAX_IX  11
 
-static PortAddr _asc_def_iop_base[ASC_IOADR_TABLE_MAX_IX] __devinitdata = {
+static PortAddr _asc_def_iop_base[ASC_IOADR_TABLE_MAX_IX] = {
         0x100, 0x0110, 0x120, 0x0130, 0x140, 0x0150, 0x0190,
         0x0210, 0x0230, 0x0250, 0x0330
 };
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 9a10b4335e7..5ea1f986220 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -428,6 +428,15 @@ void scsi_unregister(struct Scsi_Host *shost)
 }
 EXPORT_SYMBOL(scsi_unregister);
 
+static int __scsi_host_match(struct class_device *cdev, void *data)
+{
+        struct Scsi_Host *p;
+        unsigned short *hostnum = (unsigned short *)data;
+
+        p = class_to_shost(cdev);
+        return p->host_no == *hostnum;
+}
+
 /**
  * scsi_host_lookup - get a reference to a Scsi_Host by host no
  * @hostnum:    host number to locate
@@ -437,19 +446,12 @@ EXPORT_SYMBOL(scsi_unregister);
  **/
 struct Scsi_Host *scsi_host_lookup(unsigned short hostnum)
 {
-        struct class *class = &shost_class;
         struct class_device *cdev;
-        struct Scsi_Host *shost = ERR_PTR(-ENXIO), *p;
+        struct Scsi_Host *shost = ERR_PTR(-ENXIO);
 
-        down(&class->sem);
-        list_for_each_entry(cdev, &class->children, node) {
-                p = class_to_shost(cdev);
-                if (p->host_no == hostnum) {
-                        shost = scsi_host_get(p);
-                        break;
-                }
-        }
-        up(&class->sem);
+        cdev = class_find_child(&shost_class, &hostnum, __scsi_host_match);
+        if (cdev)
+                shost = scsi_host_get(class_to_shost(cdev));
 
         return shost;
 }
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 9706de9d98d..02e91893064 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -395,14 +395,12 @@ static int idescsi_expiry(ide_drive_t *drive)
 static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
 {
         idescsi_scsi_t *scsi = drive_to_idescsi(drive);
-        idescsi_pc_t *pc=scsi->pc;
+        ide_hwif_t *hwif = drive->hwif;
+        idescsi_pc_t *pc = scsi->pc;
         struct request *rq = pc->rq;
-        atapi_bcount_t bcount;
-        atapi_status_t status;
-        atapi_ireason_t ireason;
-        atapi_feature_t feature;
-
         unsigned int temp;
+        u16 bcount;
+        u8 stat, ireason;
 
 #if IDESCSI_DEBUG_LOG
         printk (KERN_INFO "ide-scsi: Reached idescsi_pc_intr interrupt handler\n");
@@ -425,30 +423,29 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
                 (void) HWIF(drive)->ide_dma_end(drive);
         }
 
-        feature.all = 0;
         /* Clear the interrupt */
-        status.all = HWIF(drive)->INB(IDE_STATUS_REG);
+        stat = drive->hwif->INB(IDE_STATUS_REG);
 
-        if (!status.b.drq) {
+        if ((stat & DRQ_STAT) == 0) {
                 /* No more interrupts */
                 if (test_bit(IDESCSI_LOG_CMD, &scsi->log))
                         printk (KERN_INFO "Packet command completed, %d bytes transferred\n", pc->actually_transferred);
                 local_irq_enable_in_hardirq();
-                if (status.b.check)
+                if (stat & ERR_STAT)
                         rq->errors++;
                 idescsi_end_request (drive, 1, 0);
                 return ide_stopped;
         }
-        bcount.b.low    = HWIF(drive)->INB(IDE_BCOUNTL_REG);
-        bcount.b.high   = HWIF(drive)->INB(IDE_BCOUNTH_REG);
-        ireason.all     = HWIF(drive)->INB(IDE_IREASON_REG);
+        bcount = (hwif->INB(IDE_BCOUNTH_REG) << 8) |
+                  hwif->INB(IDE_BCOUNTL_REG);
+        ireason = hwif->INB(IDE_IREASON_REG);
 
-        if (ireason.b.cod) {
+        if (ireason & CD) {
                 printk(KERN_ERR "ide-scsi: CoD != 0 in idescsi_pc_intr\n");
                 return ide_do_reset (drive);
         }
-        if (ireason.b.io) {
-                temp = pc->actually_transferred + bcount.all;
+        if (ireason & IO) {
+                temp = pc->actually_transferred + bcount;
                 if (temp > pc->request_transfer) {
                         if (temp > pc->buffer_size) {
                                 printk(KERN_ERR "ide-scsi: The scsi wants to "
@@ -461,11 +458,13 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
                                                 idescsi_input_buffers(drive, pc, temp);
                                         else
                                                 drive->hwif->atapi_input_bytes(drive, pc->current_position, temp);
-                                        printk(KERN_ERR "ide-scsi: transferred %d of %d bytes\n", temp, bcount.all);
+                                        printk(KERN_ERR "ide-scsi: transferred"
+                                                        " %d of %d bytes\n",
+                                                        temp, bcount);
                                 }
                                 pc->actually_transferred += temp;
                                 pc->current_position += temp;
-                                idescsi_discard_data(drive, bcount.all - temp);
+                                idescsi_discard_data(drive, bcount - temp);
                                 ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry);
                                 return ide_started;
                         }
@@ -474,22 +473,24 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive)
 #endif /* IDESCSI_DEBUG_LOG */
                 }
         }
-        if (ireason.b.io) {
+        if (ireason & IO) {
                 clear_bit(PC_WRITING, &pc->flags);
                 if (pc->sg)
-                        idescsi_input_buffers(drive, pc, bcount.all);
+                        idescsi_input_buffers(drive, pc, bcount);
                 else
-                        HWIF(drive)->atapi_input_bytes(drive, pc->current_position, bcount.all);
+                        hwif->atapi_input_bytes(drive, pc->current_position,
+                                                bcount);
         } else {
                 set_bit(PC_WRITING, &pc->flags);
                 if (pc->sg)
-                        idescsi_output_buffers (drive, pc, bcount.all);
+                        idescsi_output_buffers(drive, pc, bcount);
                 else
-                        HWIF(drive)->atapi_output_bytes(drive, pc->current_position, bcount.all);
+                        hwif->atapi_output_bytes(drive, pc->current_position,
+                                                 bcount);
         }
         /* Update the current position */
-        pc->actually_transferred += bcount.all;
-        pc->current_position += bcount.all;
+        pc->actually_transferred += bcount;
+        pc->current_position += bcount;
 
         /* And set the interrupt handler again */
         ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry);
@@ -501,16 +502,16 @@ static ide_startstop_t idescsi_transfer_pc(ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         idescsi_scsi_t *scsi = drive_to_idescsi(drive);
         idescsi_pc_t *pc = scsi->pc;
-        atapi_ireason_t ireason;
         ide_startstop_t startstop;
+        u8 ireason;
 
         if (ide_wait_stat(&startstop,drive,DRQ_STAT,BUSY_STAT,WAIT_READY)) {
                 printk(KERN_ERR "ide-scsi: Strange, packet command "
                         "initiated yet DRQ isn't asserted\n");
                 return startstop;
         }
-        ireason.all     = HWIF(drive)->INB(IDE_IREASON_REG);
-        if (!ireason.b.cod || ireason.b.io) {
+        ireason = hwif->INB(IDE_IREASON_REG);
+        if ((ireason & CD) == 0 || (ireason & IO)) {
                 printk(KERN_ERR "ide-scsi: (IO,CoD) != (0,1) while "
                                 "issuing a packet command\n");
                 return ide_do_reset (drive);
@@ -573,30 +574,26 @@ static ide_startstop_t idescsi_issue_pc (ide_drive_t *drive, idescsi_pc_t *pc)
 {
         idescsi_scsi_t *scsi = drive_to_idescsi(drive);
         ide_hwif_t *hwif = drive->hwif;
-        atapi_feature_t feature;
-        atapi_bcount_t bcount;
+        u16 bcount;
+        u8 dma = 0;
 
         scsi->pc=pc;                                                    /* Set the current packet command */
         pc->actually_transferred=0;                                     /* We haven't transferred any data yet */
         pc->current_position=pc->buffer;
-        bcount.all = min(pc->request_transfer, 63 * 1024);              /* Request to transfer the entire buffer at once */
+        /* Request to transfer the entire buffer at once */
+        bcount = min(pc->request_transfer, 63 * 1024);
 
-        feature.all = 0;
         if (drive->using_dma && !idescsi_map_sg(drive, pc)) {
                 hwif->sg_mapped = 1;
-                feature.b.dma = !hwif->dma_setup(drive);
+                dma = !hwif->dma_setup(drive);
                 hwif->sg_mapped = 0;
         }
 
         SELECT_DRIVE(drive);
-        if (IDE_CONTROL_REG)
-                HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
 
-        HWIF(drive)->OUTB(feature.all, IDE_FEATURE_REG);
-        HWIF(drive)->OUTB(bcount.b.high, IDE_BCOUNTH_REG);
-        HWIF(drive)->OUTB(bcount.b.low, IDE_BCOUNTL_REG);
+        ide_pktcmd_tf_load(drive, IDE_TFLAG_NO_SELECT_MASK, bcount, dma);
 
-        if (feature.b.dma)
+        if (dma)
                 set_bit(PC_DMA_OK, &pc->flags);
 
         if (test_bit(IDESCSI_DRQ_INTERRUPT, &scsi->flags)) {
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 01bf0189367..a10a5c74b48 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -823,7 +823,7 @@ static void initio_append_busy_scb(struct initio_host * host, struct scsi_ctrl_b
 {
 
 #if DEBUG_QUEUE
-        printk("append busy SCB %o; ", scbp);
+        printk("append busy SCB %p; ", scbp);
 #endif
         if (scbp->tagmsg)
                 host->act_tags[scbp->target]++;
@@ -2609,6 +2609,7 @@ static void initio_build_scb(struct initio_host * host, struct scsi_ctrl_blk * c
                 cblk->bufptr = cpu_to_le32((u32)dma_addr);
                 cmnd->SCp.dma_handle = dma_addr;
 
+                cblk->sglen = nseg;
 
                 cblk->flags |= SCF_SG;  /* Turn on SG list flag       */
                 total_len = 0;
@@ -2869,6 +2870,7 @@ static int initio_probe_one(struct pci_dev *pdev,
         host = (struct initio_host *)shost->hostdata;
         memset(host, 0, sizeof(struct initio_host));
         host->addr = pci_resource_start(pdev, 0);
+        host->bios_addr = bios_seg;
 
         if (!request_region(host->addr, 256, "i91u")) {
                 printk(KERN_WARNING "initio: I/O port range 0x%x is busy.\n", host->addr);
@@ -2895,6 +2897,8 @@ static int initio_probe_one(struct pci_dev *pdev,
 
         host->pci_dev = pdev;
 
+        host->semaph = 1;
+        spin_lock_init(&host->semaph_lock);
         host->num_scbs = num_scb;
         host->scb = scb;
         host->next_pending = scb;
@@ -2911,7 +2915,7 @@ static int initio_probe_one(struct pci_dev *pdev,
         host->last_avail = prev;
         spin_lock_init(&host->avail_lock);
 
-        initio_init(host, phys_to_virt(bios_seg << 4));
+        initio_init(host, phys_to_virt(((u32)bios_seg << 4)));
 
         host->jsstatus0 = 0;
 
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 9018ee851a8..73270ff892d 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -5142,6 +5142,7 @@ static void ipr_build_ata_ioadl(struct ipr_cmnd *ipr_cmd,
         struct ipr_ioadl_desc *last_ioadl = NULL;
         int len = qc->nbytes + qc->pad_len;
         struct scatterlist *sg;
+        unsigned int si;
 
         if (len == 0)
                 return;
@@ -5159,7 +5160,7 @@ static void ipr_build_ata_ioadl(struct ipr_cmnd *ipr_cmd,
                         cpu_to_be32(sizeof(struct ipr_ioadl_desc) * ipr_cmd->dma_use_sg);
         }
 
-        ata_for_each_sg(sg, qc) {
+        for_each_sg(qc->sg, sg, qc->n_elem, si) {
                 ioadl->flags_and_data_len = cpu_to_be32(ioadl_flags | sg_dma_len(sg));
                 ioadl->address = cpu_to_be32(sg_dma_address(sg));
 
@@ -5222,12 +5223,12 @@ static unsigned int ipr_qc_issue(struct ata_queued_cmd *qc)
                 regs->flags |= IPR_ATA_FLAG_XFER_TYPE_DMA;
                 break;
 
-        case ATA_PROT_ATAPI:
-        case ATA_PROT_ATAPI_NODATA:
+        case ATAPI_PROT_PIO:
+        case ATAPI_PROT_NODATA:
                 regs->flags |= IPR_ATA_FLAG_PACKET_CMD;
                 break;
 
-        case ATA_PROT_ATAPI_DMA:
+        case ATAPI_PROT_DMA:
                 regs->flags |= IPR_ATA_FLAG_PACKET_CMD;
                 regs->flags |= IPR_ATA_FLAG_XFER_TYPE_DMA;
                 break;
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index adc47d481f9..0996f866f14 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -158,8 +158,8 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
         struct Scsi_Host *host = sas_ha->core.shost;
         struct sas_internal *i = to_sas_internal(host->transportt);
         struct scatterlist *sg;
-        unsigned int num = 0;
         unsigned int xfer = 0;
+        unsigned int si;
 
         task = sas_alloc_task(GFP_ATOMIC);
         if (!task)
@@ -176,22 +176,20 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
 
         ata_tf_to_fis(&qc->tf, 1, 0, (u8*)&task->ata_task.fis);
         task->uldd_task = qc;
-        if (is_atapi_taskfile(&qc->tf)) {
+        if (ata_is_atapi(qc->tf.protocol)) {
                 memcpy(task->ata_task.atapi_packet, qc->cdb, qc->dev->cdb_len);
                 task->total_xfer_len = qc->nbytes + qc->pad_len;
                 task->num_scatter = qc->pad_len ? qc->n_elem + 1 : qc->n_elem;
         } else {
-                ata_for_each_sg(sg, qc) {
-                        num++;
+                for_each_sg(qc->sg, sg, qc->n_elem, si)
                         xfer += sg->length;
-                }
 
                 task->total_xfer_len = xfer;
-                task->num_scatter = num;
+                task->num_scatter = si;
         }
 
         task->data_dir = qc->dma_dir;
-        task->scatter = qc->__sg;
+        task->scatter = qc->sg;
         task->ata_task.retry_count = 1;
         task->task_state_flags = SAS_TASK_STATE_PENDING;
         qc->lldd_task = task;
@@ -200,7 +198,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
         case ATA_PROT_NCQ:
                 task->ata_task.use_ncq = 1;
                 /* fall through */
-        case ATA_PROT_ATAPI_DMA:
+        case ATAPI_PROT_DMA:
         case ATA_PROT_DMA:
                 task->ata_task.dma_xfer = 1;
                 break;
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 9c042254633..f869fba8680 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -467,7 +467,7 @@ int sas_eh_bus_reset_handler(struct scsi_cmnd *cmd)
         res = sas_phy_reset(phy, 1);
         if (res)
                 SAS_DPRINTK("Bus reset of %s failed 0x%x\n",
-                            phy->dev.kobj.k_name,
+                            kobject_name(&phy->dev.kobj),
                             res);
         if (res == TMF_RESP_FUNC_SUCC || res == TMF_RESP_FUNC_COMPLETE)
                 return SUCCESS;
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 8d1408e18ef..aba1e6d4806 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1817,7 +1817,7 @@ probe_out:
         return ret;
 }
 
-static void __devexit
+static void
 qla2x00_remove_one(struct pci_dev *pdev)
 {
         scsi_qla_host_t *ha;
@@ -2943,7 +2943,7 @@ static struct pci_driver qla2xxx_pci_driver = {
         },
         .id_table       = qla2xxx_pci_tbl,
         .probe          = qla2x00_probe_one,
-        .remove         = __devexit_p(qla2x00_remove_one),
+        .remove         = qla2x00_remove_one,
         .err_handler    = &qla2xxx_err_handler,
 };