diff -ur mpt2sas/mpt2sas_scsih.c /usr/src/linux/drivers/scsi/mpt2sas/mpt2sas_scsih.c
--- mpt2sas/mpt2sas_scsih.c	2013-11-20 21:35:26.000000000 -0700
+++ /usr/src/linux/drivers/scsi/mpt2sas/mpt2sas_scsih.c	2014-03-16 00:47:30.016659848 -0600
@@ -56,6 +56,7 @@
 #include <linux/aer.h>
 #endif
 #include <linux/raid_class.h>
+#include <linux/slab.h>
 
 #include "mpt2sas_base.h"
 
@@ -1490,7 +1491,7 @@
 {
 	struct Scsi_Host *shost = sdev->host;
 	int max_depth;
-	struct MPT2SAS_ADAPTER *ioc = shost_private(shost);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(shost);
 	struct MPT2SAS_DEVICE *sas_device_priv_data;
 	struct MPT2SAS_TARGET *sas_target_priv_data;
 	struct _sas_device *sas_device;
@@ -1566,7 +1567,7 @@
 	struct Scsi_Host *shost = sdev->host;
 	int max_depth;
 	int tag_type;
-	struct MPT2SAS_ADAPTER *ioc = shost_private(shost);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(shost);
 	struct MPT2SAS_DEVICE *sas_device_priv_data;
 	struct MPT2SAS_TARGET *sas_target_priv_data;
 	struct _sas_device *sas_device;
@@ -1680,7 +1681,7 @@
 _scsih_target_alloc(struct scsi_target *starget)
 {
 	struct Scsi_Host *shost = dev_to_shost(&starget->dev);
-	struct MPT2SAS_ADAPTER *ioc = shost_private(shost);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(shost);
 	struct MPT2SAS_TARGET *sas_target_priv_data;
 	struct _sas_device *sas_device;
 	struct _raid_device *raid_device;
@@ -1743,7 +1744,7 @@
 _scsih_target_destroy(struct scsi_target *starget)
 {
 	struct Scsi_Host *shost = dev_to_shost(&starget->dev);
-	struct MPT2SAS_ADAPTER *ioc = shost_private(shost);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(shost);
 	struct MPT2SAS_TARGET *sas_target_priv_data;
 	struct _sas_device *sas_device;
 	struct _raid_device *raid_device;
@@ -1817,7 +1818,7 @@
 		sdev->no_uld_attach = 1;
 
 	shost = dev_to_shost(&starget->dev);
-	ioc = shost_private(shost);
+	ioc = shost_priv(shost);
 	if (starget->channel == RAID_CHANNEL) {
 		spin_lock_irqsave(&ioc->raid_device_lock, flags);
 		raid_device = _scsih_raid_device_find_by_id(ioc,
@@ -1865,7 +1866,7 @@
 	sas_target_priv_data->num_luns--;
 
 	shost = dev_to_shost(&starget->dev);
-	ioc = shost_private(shost);
+	ioc = shost_priv(shost);
 
 	if (!(sas_target_priv_data->flags & MPT_TARGET_FLAGS_VOLUME)) {
 		spin_lock_irqsave(&ioc->sas_device_lock, flags);
@@ -1957,7 +1958,7 @@
 _scsih_get_resync(struct device *dev)
 {
 	struct scsi_device *sdev = to_scsi_device(dev);
-	struct MPT2SAS_ADAPTER *ioc = shost_private(sdev->host);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
 	static struct _raid_device *raid_device;
 	unsigned long flags;
 	Mpi2RaidVolPage0_t vol_pg0;
@@ -2009,7 +2010,7 @@
 _scsih_get_state(struct device *dev)
 {
 	struct scsi_device *sdev = to_scsi_device(dev);
-	struct MPT2SAS_ADAPTER *ioc = shost_private(sdev->host);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
 	static struct _raid_device *raid_device;
 	unsigned long flags;
 	Mpi2RaidVolPage0_t vol_pg0;
@@ -2467,7 +2468,7 @@
 _scsih_slave_configure(struct scsi_device *sdev)
 {
 	struct Scsi_Host *shost = sdev->host;
-	struct MPT2SAS_ADAPTER *ioc = shost_private(shost);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(shost);
 	struct MPT2SAS_DEVICE *sas_device_priv_data;
 	struct MPT2SAS_TARGET *sas_target_priv_data;
 	struct _sas_device *sas_device;
@@ -3131,7 +3132,7 @@
 static int
 _scsih_abort(struct scsi_cmnd *scmd)
 {
-	struct MPT2SAS_ADAPTER *ioc = shost_private(scmd->device->host);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(scmd->device->host);
 	struct MPT2SAS_DEVICE *sas_device_priv_data;
 	u16 smid;
 	u16 handle;
@@ -3192,7 +3193,7 @@
 static int
 _scsih_dev_reset(struct scsi_cmnd *scmd)
 {
-	struct MPT2SAS_ADAPTER *ioc = shost_private(scmd->device->host);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(scmd->device->host);
 	struct MPT2SAS_DEVICE *sas_device_priv_data;
 	struct _sas_device *sas_device;
 	unsigned long flags;
@@ -3252,7 +3253,7 @@
 static int
 _scsih_target_reset(struct scsi_cmnd *scmd)
 {
-	struct MPT2SAS_ADAPTER *ioc = shost_private(scmd->device->host);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(scmd->device->host);
 	struct MPT2SAS_DEVICE *sas_device_priv_data;
 	struct _sas_device *sas_device;
 	unsigned long flags;
@@ -3314,7 +3315,7 @@
 static int
 _scsih_dev_reset(struct scsi_cmnd *scmd)
 {
-	struct MPT2SAS_ADAPTER *ioc = shost_private(scmd->device->host);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(scmd->device->host);
 	struct MPT2SAS_DEVICE *sas_device_priv_data;
 	struct _sas_device *sas_device;
 	unsigned long flags;
@@ -3375,7 +3376,7 @@
 static int
 _scsih_host_reset(struct scsi_cmnd *scmd)
 {
-	struct MPT2SAS_ADAPTER *ioc = shost_private(scmd->device->host);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(scmd->device->host);
 	int r, retval;
 
 	printk(MPT2SAS_INFO_FMT "attempting host reset! scmd(%p)\n",
@@ -5156,7 +5157,7 @@
 _scsih_qcmd(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *))
 #endif
 {
-	struct MPT2SAS_ADAPTER *ioc = shost_private(scmd->device->host);
+	struct MPT2SAS_ADAPTER *ioc = shost_priv(scmd->device->host);
 	struct MPT2SAS_DEVICE *sas_device_priv_data;
 	struct MPT2SAS_TARGET *sas_target_priv_data;
 	struct _raid_device *raid_device;
@@ -10844,7 +10845,7 @@
  * Routine called when unloading the driver and hotplug remove.
  * Return nothing.
  */
-static void __devexit
+static void
 _scsih_remove(struct pci_dev *pdev)
 {
         mpt2sas_scsih_detach_pci(pdev);
@@ -10868,7 +10869,7 @@
 	shost = pci_get_drvdata(pdev);
 	if (!shost)
 		goto out;
-	ioc = shost_private(shost);
+	ioc = shost_priv(shost);
 
 	ioc->remove_host = 1;
 	_scsih_fw_event_cleanup_queue(ioc);
@@ -11250,7 +11251,7 @@
 		return -ENODEV;
 
 	/* init local params */
-	ioc = shost_private(shost);
+	ioc = shost_priv(shost);
 	memset(ioc, 0, sizeof(struct MPT2SAS_ADAPTER));
 	INIT_LIST_HEAD(&ioc->list);
 	list_add_tail(&ioc->list, &mpt2sas_ioc_list);
@@ -11435,7 +11436,7 @@
 	shost = pci_get_drvdata(pdev);
 	if (!shost)
 		goto out;
-	ioc = shost_private(shost);
+	ioc = shost_priv(shost);
 
 	mpt2sas_base_stop_watchdog(ioc);
 	flush_scheduled_work();
@@ -11473,7 +11474,7 @@
 	shost = pci_get_drvdata(pdev);
 	if (!shost)
 		goto out;
-	ioc = shost_private(shost);
+	ioc = shost_priv(shost);
 	device_state = pdev->current_state;
 
 	printk(MPT2SAS_INFO_FMT "pdev=0x%p, slot=%s, previous "
@@ -11516,7 +11517,7 @@
 	shost = pci_get_drvdata(pdev);
 	if (!shost)
 		goto out;
-	ioc = shost_private(shost);
+	ioc = shost_priv(shost);
 
 	printk(MPT2SAS_INFO_FMT "PCI error: detected callback, state(%d)!!\n",
 	    ioc->name, state);
@@ -11565,7 +11566,7 @@
 	shost = pci_get_drvdata(pdev);
 	if (!shost)
 		goto out;
-	ioc = shost_private(shost);
+	ioc = shost_priv(shost);
 
 	printk(MPT2SAS_INFO_FMT "PCI error: slot reset callback!!\n",
 	     ioc->name);
@@ -11613,7 +11614,7 @@
 	shost = pci_get_drvdata(pdev);
 	if (!shost)
 	goto out;
-	ioc = shost_private(shost);
+	ioc = shost_priv(shost);
 
 	printk(MPT2SAS_INFO_FMT "PCI error: resume callback!!\n", ioc->name);
 
@@ -11640,7 +11641,7 @@
 	shost = pci_get_drvdata(pdev);
 	if (!shost)
 		goto out;
-	ioc = shost_private(shost);
+	ioc = shost_priv(shost);
 
 	printk(MPT2SAS_INFO_FMT "PCI error: mmio enabled callback!!\n",
 	    ioc->name);
@@ -11675,7 +11676,7 @@
 	.name		= MPT2SAS_DRIVER_NAME,
 	.id_table	= scsih_pci_table,
 	.probe		= _scsih_probe,
-	.remove		= __devexit_p(_scsih_remove),
+	.remove		= _scsih_remove,
 	.shutdown	= _scsih_shutdown,
 	.err_handler	= &_scsih_err_handler,
 #ifdef CONFIG_PM