Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/fsl', 'asoc/fix/tegra...

[linux-drm-fsl-dcu.git] / drivers / scsi / megaraid / megaraid_mbox.c

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 515c9629e9fedf0679257a762b553045858070c1..e2237a97cb9d314b485869cc37da7e3de8062531 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -367,6 +367,7 @@ static struct scsi_host_template megaraid_template_g = {
        .eh_host_reset_handler          = megaraid_reset_handler,
        .change_queue_depth             = megaraid_change_queue_depth,
        .use_clustering                 = ENABLE_CLUSTERING,
+       .no_write_same                  = 1,
        .sdev_attrs                     = megaraid_sdev_attrs,
        .shost_attrs                    = megaraid_shost_attrs,
 };
@@ -534,7 +535,6 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
        return 0;
 
 out_cmm_unreg:
-       pci_set_drvdata(pdev, NULL);
        megaraid_cmm_unregister(adapter);
 out_fini_mbox:
        megaraid_fini_mbox(adapter);
@@ -594,11 +594,6 @@ megaraid_detach_one(struct pci_dev *pdev)
        // detach from the IO sub-system
        megaraid_io_detach(adapter);
 
-       // reset the device state in the PCI structure. We check this
-       // condition when we enter here. If the device state is NULL,
-       // that would mean the device has already been removed
-       pci_set_drvdata(pdev, NULL);
-
        // Unregister from common management module
        //
        // FIXME: this must return success or failure for conditions if there