9 files changed, 28 insertions, 51 deletions

diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 34dbc37a79d4..bc6e4627c7a1 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -1916,9 +1916,9 @@ static void __twa_shutdown(TW_Device_Extension *tw_dev)
 } /* End __twa_shutdown() */
 
 /* Wrapper for __twa_shutdown */
-static void twa_shutdown(struct device *dev)
+static void twa_shutdown(struct pci_dev *pdev)
 {
-        struct Scsi_Host *host = pci_get_drvdata(to_pci_dev(dev));
+        struct Scsi_Host *host = pci_get_drvdata(pdev);
         TW_Device_Extension *tw_dev = (TW_Device_Extension *)host->hostdata;
 
         __twa_shutdown(tw_dev);
@@ -2140,9 +2140,7 @@ static struct pci_driver twa_driver = {
         .id_table       = twa_pci_tbl,
         .probe          = twa_probe,
         .remove         = twa_remove,
-        .driver         = {
-                .shutdown = twa_shutdown
-        }
+        .shutdown       = twa_shutdown
 };
 
 /* This function is called on driver initialization */
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index b6dc576da430..973c51fb0fe2 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -2264,9 +2264,9 @@ static void __tw_shutdown(TW_Device_Extension *tw_dev)
 } /* End __tw_shutdown() */
 
 /* Wrapper for __tw_shutdown */
-static void tw_shutdown(struct device *dev)
+static void tw_shutdown(struct pci_dev *pdev)
 {
-        struct Scsi_Host *host = pci_get_drvdata(to_pci_dev(dev));
+        struct Scsi_Host *host = pci_get_drvdata(pdev);
         TW_Device_Extension *tw_dev = (TW_Device_Extension *)host->hostdata;
 
         __tw_shutdown(tw_dev);
@@ -2451,9 +2451,7 @@ static struct pci_driver tw_driver = {
         .id_table       = tw_pci_tbl,
         .probe          = tw_probe,
         .remove         = tw_remove,
-        .driver         = {
-                .shutdown = tw_shutdown
-        }
+        .shutdown       = tw_shutdown,
 };
 
 /* This function is called on driver initialization */
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 9a547ca9c864..c5623694d10f 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -304,26 +304,19 @@ static int ahci_port_start(struct ata_port *ap)
         struct device *dev = ap->host_set->dev;
         struct ahci_host_priv *hpriv = ap->host_set->private_data;
         struct ahci_port_priv *pp;
-        int rc;
         void *mem, *mmio = ap->host_set->mmio_base;
         void *port_mmio = ahci_port_base(mmio, ap->port_no);
         dma_addr_t mem_dma;
 
-        rc = ata_port_start(ap);
-        if (rc)
-                return rc;
-
         pp = kmalloc(sizeof(*pp), GFP_KERNEL);
-        if (!pp) {
-                rc = -ENOMEM;
-                goto err_out;
-        }
+        if (!pp)
+                return -ENOMEM;
         memset(pp, 0, sizeof(*pp));
 
         mem = dma_alloc_coherent(dev, AHCI_PORT_PRIV_DMA_SZ, &mem_dma, GFP_KERNEL);
         if (!mem) {
-                rc = -ENOMEM;
-                goto err_out_kfree;
+                kfree(pp);
+                return -ENOMEM;
         }
         memset(mem, 0, AHCI_PORT_PRIV_DMA_SZ);
 
@@ -373,12 +366,6 @@ static int ahci_port_start(struct ata_port *ap)
         readl(port_mmio + PORT_CMD); /* flush */
 
         return 0;
-
-err_out_kfree:
-        kfree(pp);
-err_out:
-        ata_port_stop(ap);
-        return rc;
 }
 
 
@@ -404,7 +391,6 @@ static void ahci_port_stop(struct ata_port *ap)
         dma_free_coherent(dev, AHCI_PORT_PRIV_DMA_SZ,
                           pp->cmd_slot, pp->cmd_slot_dma);
         kfree(pp);
-        ata_port_stop(ap);
 }
 
 static u32 ahci_scr_read (struct ata_port *ap, unsigned int sc_reg_in)
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 80d022625c82..babd48363402 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -6012,7 +6012,7 @@ static int __devinit ipr_probe(struct pci_dev *pdev,
 
 /**
  * ipr_shutdown - Shutdown handler.
- * @dev:        device struct
+ * @pdev:       pci device struct
  *
  * This function is invoked upon system shutdown/reboot. It will issue
  * an adapter shutdown to the adapter to flush the write cache.
@@ -6020,9 +6020,9 @@ static int __devinit ipr_probe(struct pci_dev *pdev,
  * Return value:
  *      none
  **/
-static void ipr_shutdown(struct device *dev)
+static void ipr_shutdown(struct pci_dev *pdev)
 {
-        struct ipr_ioa_cfg *ioa_cfg = pci_get_drvdata(to_pci_dev(dev));
+        struct ipr_ioa_cfg *ioa_cfg = pci_get_drvdata(pdev);
         unsigned long lock_flags = 0;
 
         spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
@@ -6068,9 +6068,7 @@ static struct pci_driver ipr_driver = {
         .id_table = ipr_pci_table,
         .probe = ipr_probe,
         .remove = ipr_remove,
-        .driver = {
-                .shutdown = ipr_shutdown,
-        },
+        .shutdown = ipr_shutdown,
 };
 
 /**
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 36b401fee1f1..cb535fa185b9 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1408,7 +1408,9 @@ void __sata_phy_reset(struct ata_port *ap)
         if (ap->flags & ATA_FLAG_SATA_RESET) {
                 /* issue phy wake/reset */
                 scr_write_flush(ap, SCR_CONTROL, 0x301);
-                udelay(400);                    /* FIXME: a guess */
+                /* Couldn't find anything in SATA I/II specs, but
+                 * AHCI-1.1 10.4.2 says at least 1 ms. */
+                mdelay(1);
         }
         scr_write_flush(ap, SCR_CONTROL, 0x300); /* phy wake/clear reset */
 
@@ -1920,6 +1922,7 @@ static const char * ata_dma_blacklist [] = {
         "HITACHI CDR-8335",
         "HITACHI CDR-8435",
         "Toshiba CD-ROM XM-6202B",
+        "TOSHIBA CD-ROM XM-1702BC",
         "CD-532E-A",
         "E-IDE CD-ROM CR-840",
         "CD-ROM Drive/F5A",
@@ -1927,7 +1930,6 @@ static const char * ata_dma_blacklist [] = {
         "SAMSUNG CD-ROM SC-148C",
         "SAMSUNG CD-ROM SC",
         "SanDisk SDP3B-64",
-        "SAMSUNG CD-ROM SN-124",
         "ATAPI CD-ROM DRIVE 40X MAXIMUM",
         "_NEC DV5800A",
 };
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index edd47d1f0b17..932dcf0366eb 100644
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -424,7 +424,7 @@ static struct scsi_host_template mac53c94_template = {
         .use_clustering = DISABLE_CLUSTERING,
 };
 
-static int mac53c94_probe(struct macio_dev *mdev, const struct of_match *match)
+static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *match)
 {
         struct device_node *node = macio_get_of_node(mdev);
         struct pci_dev *pdev = macio_get_pci_dev(mdev);
@@ -544,15 +544,14 @@ static int mac53c94_remove(struct macio_dev *mdev)
 }
 
 
-static struct of_match mac53c94_match[] = 
+static struct of_device_id mac53c94_match[] = 
 {
         {
         .name           = "53c94",
-        .type           = OF_ANY_MATCH,
-        .compatible     = OF_ANY_MATCH
         },
         {},
 };
+MODULE_DEVICE_TABLE (of, mac53c94_match);
 
 static struct macio_driver mac53c94_driver = 
 {
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index ec81532eb845..a70cdf31311c 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -5036,9 +5036,9 @@ megaraid_remove_one(struct pci_dev *pdev)
 }
 
 static void
-megaraid_shutdown(struct device *dev)
+megaraid_shutdown(struct pci_dev *pdev)
 {
-        struct Scsi_Host *host = pci_get_drvdata(to_pci_dev(dev));
+        struct Scsi_Host *host = pci_get_drvdata(pdev);
         adapter_t *adapter = (adapter_t *)host->hostdata;
 
         __megaraid_shutdown(adapter);
@@ -5070,9 +5070,7 @@ static struct pci_driver megaraid_pci_driver = {
         .id_table       = megaraid_pci_tbl,
         .probe          = megaraid_probe_one,
         .remove         = __devexit_p(megaraid_remove_one),
-        .driver         = {
-                .shutdown = megaraid_shutdown,
-        },
+        .shutdown       = megaraid_shutdown,
 };
 
 static int __init megaraid_init(void)
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index b05737ae5eff..ff1933298da6 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1847,7 +1847,7 @@ static struct scsi_host_template mesh_template = {
         .use_clustering                 = DISABLE_CLUSTERING,
 };
 
-static int mesh_probe(struct macio_dev *mdev, const struct of_match *match)
+static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
 {
         struct device_node *mesh = macio_get_of_node(mdev);
         struct pci_dev* pdev = macio_get_pci_dev(mdev);
@@ -2012,20 +2012,18 @@ static int mesh_remove(struct macio_dev *mdev)
 }
 
 
-static struct of_match mesh_match[] = 
+static struct of_device_id mesh_match[] = 
 {
         {
         .name           = "mesh",
-        .type           = OF_ANY_MATCH,
-        .compatible     = OF_ANY_MATCH
         },
         {
-        .name           = OF_ANY_MATCH,
         .type           = "scsi",
         .compatible     = "chrp,mesh0"
         },
         {},
 };
+MODULE_DEVICE_TABLE (of, mesh_match);
 
 static struct macio_driver mesh_driver = 
 {
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 621dee8b8cb2..10506f9cd0c9 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -632,7 +632,7 @@ static void scsi_free_sgtable(struct scatterlist *sgl, int index)
 {
         struct scsi_host_sg_pool *sgp;
 
-        BUG_ON(index > SG_MEMPOOL_NR);
+        BUG_ON(index >= SG_MEMPOOL_NR);
 
         sgp = scsi_sg_pools + index;
         mempool_free(sgl, sgp->pool);