Patched in Tegra support.

17 files changed, 118 insertions, 261 deletions

diff --git a/drivers/message/fusion/lsi/mpi_cnfg.h b/drivers/message/fusion/lsi/mpi_cnfg.h
index d9bcfba6b04..22027e7946f 100644
--- a/drivers/message/fusion/lsi/mpi_cnfg.h
+++ b/drivers/message/fusion/lsi/mpi_cnfg.h
@@ -583,7 +583,6 @@ typedef struct _MSG_CONFIG_REPLY
 #define MPI_MANUFACTPAGE_DEVID_SAS1066E             (0x005A)
 #define MPI_MANUFACTPAGE_DEVID_SAS1068              (0x0054)
 #define MPI_MANUFACTPAGE_DEVID_SAS1068E             (0x0058)
-#define MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP      (0x0059)
 #define MPI_MANUFACTPAGE_DEVID_SAS1078              (0x0062)
 
 
diff --git a/drivers/message/fusion/lsi/mpi_ioc.h b/drivers/message/fusion/lsi/mpi_ioc.h
index 19fb21b8f0c..fd6222882a0 100644
--- a/drivers/message/fusion/lsi/mpi_ioc.h
+++ b/drivers/message/fusion/lsi/mpi_ioc.h
@@ -857,7 +857,7 @@ typedef struct _EVENT_DATA_SAS_DISCOVERY
 #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_MASK                  (0xFFFF0000)
 #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_SHIFT                 (16)
 
-/* SAS Discovery Error Event data */
+/* SAS Discovery Errror Event data */
 
 typedef struct _EVENT_DATA_DISCOVERY_ERROR
 {
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index fb69baa06ca..7956a10f948 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -63,8 +63,6 @@
 #ifdef CONFIG_MTRR
 #include <asm/mtrr.h>
 #endif
-#include <linux/kthread.h>
-#include <scsi/scsi_host.h>
 
 #include "mptbase.h"
 #include "lsi/mpi_log_fc.h"
@@ -115,8 +113,7 @@ module_param(mpt_fwfault_debug, int, 0600);
 MODULE_PARM_DESC(mpt_fwfault_debug,
                  "Enable detection of Firmware fault and halt Firmware on fault - (default=0)");
 
-static char     MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS]
-                                [MPT_MAX_CALLBACKNAME_LEN+1];
+static char     MptCallbacksName[MPT_MAX_PROTOCOL_DRIVERS][50];
 
 #ifdef MFCNT
 static int mfcounter = 0;
@@ -326,32 +323,6 @@ mpt_is_discovery_complete(MPT_ADAPTER *ioc)
         return rc;
 }
 
-
-/**
- *  mpt_remove_dead_ioc_func - kthread context to remove dead ioc
- * @arg: input argument, used to derive ioc
- *
- * Return 0 if controller is removed from pci subsystem.
- * Return -1 for other case.
- */
-static int mpt_remove_dead_ioc_func(void *arg)
-{
-        MPT_ADAPTER *ioc = (MPT_ADAPTER *)arg;
-        struct pci_dev *pdev;
-
-        if ((ioc == NULL))
-                return -1;
-
-        pdev = ioc->pcidev;
-        if ((pdev == NULL))
-                return -1;
-
-        pci_stop_and_remove_bus_device(pdev);
-        return 0;
-}
-
-
-
 /**
  *      mpt_fault_reset_work - work performed on workq after ioc fault
  *      @work: input argument, used to derive ioc
@@ -365,45 +336,12 @@ mpt_fault_reset_work(struct work_struct *work)
         u32              ioc_raw_state;
         int              rc;
         unsigned long    flags;
-        MPT_SCSI_HOST   *hd;
-        struct task_struct *p;
 
         if (ioc->ioc_reset_in_progress || !ioc->active)
                 goto out;
 
-
         ioc_raw_state = mpt_GetIocState(ioc, 0);
-        if ((ioc_raw_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_MASK) {
-                printk(MYIOC_s_INFO_FMT "%s: IOC is non-operational !!!!\n",
-                    ioc->name, __func__);
-
-                /*
-                 * Call mptscsih_flush_pending_cmds callback so that we
-                 * flush all pending commands back to OS.
-                 * This call is required to aovid deadlock at block layer.
-                 * Dead IOC will fail to do diag reset,and this call is safe
-                 * since dead ioc will never return any command back from HW.
-                 */
-                hd = shost_priv(ioc->sh);
-                ioc->schedule_dead_ioc_flush_running_cmds(hd);
-
-                /*Remove the Dead Host */
-                p = kthread_run(mpt_remove_dead_ioc_func, ioc,
-                                "mpt_dead_ioc_%d", ioc->id);
-                if (IS_ERR(p))  {
-                        printk(MYIOC_s_ERR_FMT
-                                "%s: Running mpt_dead_ioc thread failed !\n",
-                                ioc->name, __func__);
-                } else {
-                        printk(MYIOC_s_WARN_FMT
-                                "%s: Running mpt_dead_ioc thread success !\n",
-                                ioc->name, __func__);
-                }
-                return; /* don't rearm timer */
-        }
-
-        if ((ioc_raw_state & MPI_IOC_STATE_MASK)
-                        == MPI_IOC_STATE_FAULT) {
+        if ((ioc_raw_state & MPI_IOC_STATE_MASK) == MPI_IOC_STATE_FAULT) {
                 printk(MYIOC_s_WARN_FMT "IOC is in FAULT state (%04xh)!!!\n",
                        ioc->name, ioc_raw_state & MPI_DOORBELL_DATA_MASK);
                 printk(MYIOC_s_WARN_FMT "Issuing HardReset from %s!!\n",
@@ -718,8 +656,8 @@ mpt_register(MPT_CALLBACK cbfunc, MPT_DRIVER_CLASS dclass, char *func_name)
                         MptDriverClass[cb_idx] = dclass;
                         MptEvHandlers[cb_idx] = NULL;
                         last_drv_idx = cb_idx;
-                        strlcpy(MptCallbacksName[cb_idx], func_name,
-                                MPT_MAX_CALLBACKNAME_LEN+1);
+                        memcpy(MptCallbacksName[cb_idx], func_name,
+                            strlen(func_name) > 50 ? 50 : strlen(func_name));
                         break;
                 }
         }
@@ -1653,6 +1591,7 @@ mpt_mapresources(MPT_ADAPTER *ioc)
         unsigned long    port;
         u32              msize;
         u32              psize;
+        u8               revision;
         int              r = -ENODEV;
         struct pci_dev *pdev;
 
@@ -1666,9 +1605,11 @@ mpt_mapresources(MPT_ADAPTER *ioc)
         if (pci_request_selected_regions(pdev, ioc->bars, "mpt")) {
                 printk(MYIOC_s_ERR_FMT "pci_request_selected_regions() with "
                     "MEM failed\n", ioc->name);
-                goto out_pci_disable_device;
+                return r;
         }
 
+        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
+
         if (sizeof(dma_addr_t) > 4) {
                 const uint64_t required_mask = dma_get_required_mask
                     (&pdev->dev);
@@ -1690,7 +1631,8 @@ mpt_mapresources(MPT_ADAPTER *ioc)
                 } else {
                         printk(MYIOC_s_WARN_FMT "no suitable DMA mask for %s\n",
                             ioc->name, pci_name(pdev));
-                        goto out_pci_release_region;
+                        pci_release_selected_regions(pdev, ioc->bars);
+                        return r;
                 }
         } else {
                 if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))
@@ -1703,7 +1645,8 @@ mpt_mapresources(MPT_ADAPTER *ioc)
                 } else {
                         printk(MYIOC_s_WARN_FMT "no suitable DMA mask for %s\n",
                             ioc->name, pci_name(pdev));
-                        goto out_pci_release_region;
+                        pci_release_selected_regions(pdev, ioc->bars);
+                        return r;
                 }
         }
 
@@ -1733,8 +1676,8 @@ mpt_mapresources(MPT_ADAPTER *ioc)
         if (mem == NULL) {
                 printk(MYIOC_s_ERR_FMT ": ERROR - Unable to map adapter"
                         " memory!\n", ioc->name);
-                r = -EINVAL;
-                goto out_pci_release_region;
+                pci_release_selected_regions(pdev, ioc->bars);
+                return -EINVAL;
         }
         ioc->memmap = mem;
         dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "mem = %p, mem_phys = %llx\n",
@@ -1748,12 +1691,6 @@ mpt_mapresources(MPT_ADAPTER *ioc)
         ioc->pio_chip = (SYSIF_REGS __iomem *)port;
 
         return 0;
-
-out_pci_release_region:
-        pci_release_selected_regions(pdev, ioc->bars);
-out_pci_disable_device:
-        pci_disable_device(pdev);
-        return r;
 }
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -1780,6 +1717,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         MPT_ADAPTER     *ioc;
         u8               cb_idx;
         int              r = -ENODEV;
+        u8               revision;
         u8               pcixcmd;
         static int       mpt_ids = 0;
 #ifdef CONFIG_PROC_FS
@@ -1887,8 +1825,8 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "facts @ %p, pfacts[0] @ %p\n",
             ioc->name, &ioc->facts, &ioc->pfacts[0]));
 
-        mpt_get_product_name(pdev->vendor, pdev->device, pdev->revision,
-                             ioc->prod_name);
+        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
+        mpt_get_product_name(pdev->vendor, pdev->device, revision, ioc->prod_name);
 
         switch (pdev->device)
         {
@@ -1903,7 +1841,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 break;
 
         case MPI_MANUFACTPAGE_DEVICEID_FC929X:
-                if (pdev->revision < XL_929) {
+                if (revision < XL_929) {
                         /* 929X Chip Fix. Set Split transactions level
                         * for PCIX. Set MOST bits to zero.
                         */
@@ -1934,7 +1872,7 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 /* 1030 Chip Fix. Disable Split transactions
                  * for PCIX. Set MOST bits to zero if Rev < C0( = 8).
                  */
-                if (pdev->revision < C0_1030) {
+                if (revision < C0_1030) {
                         pci_read_config_byte(pdev, 0x6a, &pcixcmd);
                         pcixcmd &= 0x8F;
                         pci_write_config_byte(pdev, 0x6a, pcixcmd);
@@ -6475,20 +6413,8 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg)
                         pReq->Action, ioc->mptbase_cmds.status, timeleft));
                 if (ioc->mptbase_cmds.status & MPT_MGMT_STATUS_DID_IOCRESET)
                         goto out;
-                if (!timeleft) {
-                        spin_lock_irqsave(&ioc->taskmgmt_lock, flags);
-                        if (ioc->ioc_reset_in_progress) {
-                                spin_unlock_irqrestore(&ioc->taskmgmt_lock,
-                                        flags);
-                                printk(MYIOC_s_INFO_FMT "%s: host reset in"
-                                        " progress mpt_config timed out.!!\n",
-                                        __func__, ioc->name);
-                                mutex_unlock(&ioc->mptbase_cmds.mutex);
-                                return -EFAULT;
-                        }
-                        spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags);
+                if (!timeleft)
                         issue_hard_reset = 1;
-                }
                 goto out;
         }
 
@@ -7202,18 +7128,7 @@ mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag)
         spin_lock_irqsave(&ioc->taskmgmt_lock, flags);
         if (ioc->ioc_reset_in_progress) {
                 spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags);
-                ioc->wait_on_reset_completion = 1;
-                do {
-                        ssleep(1);
-                } while (ioc->ioc_reset_in_progress == 1);
-                ioc->wait_on_reset_completion = 0;
-                return ioc->reset_status;
-        }
-        if (ioc->wait_on_reset_completion) {
-                spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags);
-                rc = 0;
-                time_count = jiffies;
-                goto exit;
+                return 0;
         }
         ioc->ioc_reset_in_progress = 1;
         if (ioc->alt_ioc)
@@ -7250,7 +7165,6 @@ mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag)
         ioc->ioc_reset_in_progress = 0;
         ioc->taskmgmt_quiesce_io = 0;
         ioc->taskmgmt_in_progress = 0;
-        ioc->reset_status = rc;
         if (ioc->alt_ioc) {
                 ioc->alt_ioc->ioc_reset_in_progress = 0;
                 ioc->alt_ioc->taskmgmt_quiesce_io = 0;
@@ -7266,7 +7180,7 @@ mpt_HardResetHandler(MPT_ADAPTER *ioc, int sleepFlag)
                                         ioc->alt_ioc, MPT_IOC_POST_RESET);
                 }
         }
-exit:
+
         dtmprintk(ioc,
             printk(MYIOC_s_DEBUG_FMT
                 "HardResetHandler: completed (%d seconds): %s\n", ioc->name,
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 76c05bc24cb..fe902338539 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -76,8 +76,8 @@
 #define COPYRIGHT       "Copyright (c) 1999-2008 " MODULEAUTHOR
 #endif
 
-#define MPT_LINUX_VERSION_COMMON        "3.04.20"
-#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.04.20"
+#define MPT_LINUX_VERSION_COMMON        "3.04.19"
+#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.04.19"
 #define WHAT_MAGIC_STRING               "@" "(" "#" ")"
 
 #define show_mptmod_ver(s,ver)  \
@@ -89,7 +89,6 @@
  */
 #define MPT_MAX_ADAPTERS                18
 #define MPT_MAX_PROTOCOL_DRIVERS        16
-#define MPT_MAX_CALLBACKNAME_LEN        49
 #define MPT_MAX_BUS                     1       /* Do not change */
 #define MPT_MAX_FC_DEVICES              255
 #define MPT_MAX_SCSI_DEVICES            16
@@ -555,47 +554,10 @@ struct mptfc_rport_info
         u8              flags;
 };
 
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-
-/*
- * MPT_SCSI_HOST defines - Used by the IOCTL and the SCSI drivers
- * Private to the driver.
- */
-
-#define MPT_HOST_BUS_UNKNOWN            (0xFF)
-#define MPT_HOST_TOO_MANY_TM            (0x05)
-#define MPT_HOST_NVRAM_INVALID          (0xFFFFFFFF)
-#define MPT_HOST_NO_CHAIN               (0xFFFFFFFF)
-#define MPT_NVRAM_MASK_TIMEOUT          (0x000000FF)
-#define MPT_NVRAM_SYNC_MASK             (0x0000FF00)
-#define MPT_NVRAM_SYNC_SHIFT            (8)
-#define MPT_NVRAM_DISCONNECT_ENABLE     (0x00010000)
-#define MPT_NVRAM_ID_SCAN_ENABLE        (0x00020000)
-#define MPT_NVRAM_LUN_SCAN_ENABLE       (0x00040000)
-#define MPT_NVRAM_TAG_QUEUE_ENABLE      (0x00080000)
-#define MPT_NVRAM_WIDE_DISABLE          (0x00100000)
-#define MPT_NVRAM_BOOT_CHOICE           (0x00200000)
-
-typedef enum {
-        FC,
-        SPI,
-        SAS
-} BUS_TYPE;
-
-typedef struct _MPT_SCSI_HOST {
-        struct _MPT_ADAPTER              *ioc;
-        ushort                    sel_timeout[MPT_MAX_FC_DEVICES];
-        char                      *info_kbuf;
-        long                      last_queue_full;
-        u16                       spi_pending;
-        struct list_head          target_reset_list;
-} MPT_SCSI_HOST;
-
 typedef void (*MPT_ADD_SGE)(void *pAddr, u32 flagslength, dma_addr_t dma_addr);
 typedef void (*MPT_ADD_CHAIN)(void *pAddr, u8 next, u16 length,
                 dma_addr_t dma_addr);
 typedef void (*MPT_SCHEDULE_TARGET_RESET)(void *ioc);
-typedef void (*MPT_FLUSH_RUNNING_CMDS)(MPT_SCSI_HOST *hd);
 
 /*
  *  Adapter Structure - pci_dev specific. Maximum: MPT_MAX_ADAPTERS
@@ -754,10 +716,7 @@ typedef struct _MPT_ADAPTER
         int                      taskmgmt_in_progress;
         u8                       taskmgmt_quiesce_io;
         u8                       ioc_reset_in_progress;
-        u8                       reset_status;
-        u8                       wait_on_reset_completion;
         MPT_SCHEDULE_TARGET_RESET schedule_target_reset;
-        MPT_FLUSH_RUNNING_CMDS schedule_dead_ioc_flush_running_cmds;
         struct work_struct       sas_persist_task;
 
         struct work_struct       fc_setup_reset_work;
@@ -871,6 +830,19 @@ typedef struct _MPT_LOCAL_REPLY {
         u32     pad;
 } MPT_LOCAL_REPLY;
 
+#define MPT_HOST_BUS_UNKNOWN            (0xFF)
+#define MPT_HOST_TOO_MANY_TM            (0x05)
+#define MPT_HOST_NVRAM_INVALID          (0xFFFFFFFF)
+#define MPT_HOST_NO_CHAIN               (0xFFFFFFFF)
+#define MPT_NVRAM_MASK_TIMEOUT          (0x000000FF)
+#define MPT_NVRAM_SYNC_MASK             (0x0000FF00)
+#define MPT_NVRAM_SYNC_SHIFT            (8)
+#define MPT_NVRAM_DISCONNECT_ENABLE     (0x00010000)
+#define MPT_NVRAM_ID_SCAN_ENABLE        (0x00020000)
+#define MPT_NVRAM_LUN_SCAN_ENABLE       (0x00040000)
+#define MPT_NVRAM_TAG_QUEUE_ENABLE      (0x00080000)
+#define MPT_NVRAM_WIDE_DISABLE          (0x00100000)
+#define MPT_NVRAM_BOOT_CHOICE           (0x00200000)
 
 /* The TM_STATE variable is used to provide strict single threading of TM
  * requests as well as communicate TM error conditions.
@@ -879,6 +851,21 @@ typedef struct _MPT_LOCAL_REPLY {
 #define TM_STATE_IN_PROGRESS   (1)
 #define TM_STATE_ERROR         (2)
 
+typedef enum {
+        FC,
+        SPI,
+        SAS
+} BUS_TYPE;
+
+typedef struct _MPT_SCSI_HOST {
+        MPT_ADAPTER              *ioc;
+        ushort                    sel_timeout[MPT_MAX_FC_DEVICES];
+        char                      *info_kbuf;
+        long                      last_queue_full;
+        u16                       spi_pending;
+        struct list_head          target_reset_list;
+} MPT_SCSI_HOST;
+
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
  *      More Dynamic Multi-Pathing stuff...
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index b383b6961e5..6e6e16aab9d 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1250,6 +1250,7 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
         int                     iocnum;
         unsigned int            port;
         int                     cim_rev;
+        u8                      revision;
         struct scsi_device      *sdev;
         VirtDevice              *vdevice;
 
@@ -1323,7 +1324,8 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
         pdev = (struct pci_dev *) ioc->pcidev;
 
         karg->pciId = pdev->device;
-        karg->hwRev = pdev->revision;
+        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
+        karg->hwRev = revision;
         karg->subSystemDevice = pdev->subsystem_device;
         karg->subSystemVendor = pdev->subsystem_vendor;
 
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index c13cd9bc590..d784c36707c 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -100,7 +100,7 @@ static int mptfc_slave_alloc(struct scsi_device *sdev);
 static int mptfc_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt);
 static void mptfc_target_destroy(struct scsi_target *starget);
 static void mptfc_set_rport_loss_tmo(struct fc_rport *rport, uint32_t timeout);
-static void mptfc_remove(struct pci_dev *pdev);
+static void __devexit mptfc_remove(struct pci_dev *pdev);
 static int mptfc_abort(struct scsi_cmnd *SCpnt);
 static int mptfc_dev_reset(struct scsi_cmnd *SCpnt);
 static int mptfc_bus_reset(struct scsi_cmnd *SCpnt);
@@ -1360,7 +1360,7 @@ static struct pci_driver mptfc_driver = {
         .name           = "mptfc",
         .id_table       = mptfc_pci_table,
         .probe          = mptfc_probe,
-        .remove         = mptfc_remove,
+        .remove         = __devexit_p(mptfc_remove),
         .shutdown       = mptscsih_shutdown,
 #ifdef CONFIG_PM
         .suspend        = mptscsih_suspend,
@@ -1496,7 +1496,8 @@ mptfc_init(void)
  *      @pdev: Pointer to pci_dev structure
  *
  */
-static void mptfc_remove(struct pci_dev *pdev)
+static void __devexit
+mptfc_remove(struct pci_dev *pdev)
 {
         MPT_ADAPTER             *ioc = pci_get_drvdata(pdev);
         struct mptfc_rport_info *p, *n;
diff --git a/drivers/message/fusion/mptlan.h b/drivers/message/fusion/mptlan.h
index 69e9d546356..c171afa9323 100644
--- a/drivers/message/fusion/mptlan.h
+++ b/drivers/message/fusion/mptlan.h
@@ -69,6 +69,7 @@
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
 #include <linux/delay.h>
+// #include <linux/trdevice.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index fa43c391c8e..7596aecd507 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -92,11 +92,6 @@ static int max_lun = MPTSAS_MAX_LUN;
 module_param(max_lun, int, 0);
 MODULE_PARM_DESC(max_lun, " max lun, default=16895 ");
 
-static int mpt_loadtime_max_sectors = 8192;
-module_param(mpt_loadtime_max_sectors, int, 0);
-MODULE_PARM_DESC(mpt_loadtime_max_sectors,
-                " Maximum sector define for Host Bus Adaptor.Range 64 to 8192 default=8192");
-
 static u8       mptsasDoneCtx = MPT_MAX_PROTOCOL_DRIVERS;
 static u8       mptsasTaskCtx = MPT_MAX_PROTOCOL_DRIVERS;
 static u8       mptsasInternalCtx = MPT_MAX_PROTOCOL_DRIVERS; /* Used only for internal commands */
@@ -290,11 +285,10 @@ mptsas_add_fw_event(MPT_ADAPTER *ioc, struct fw_event_work *fw_event,
         spin_lock_irqsave(&ioc->fw_event_lock, flags);
         list_add_tail(&fw_event->list, &ioc->fw_event_list);
         INIT_DELAYED_WORK(&fw_event->work, mptsas_firmware_event_work);
-        devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: add (fw_event=0x%p)"
-                "on cpuid %d\n", ioc->name, __func__,
-                fw_event, smp_processor_id()));
-        queue_delayed_work_on(smp_processor_id(), ioc->fw_event_q,
-            &fw_event->work, delay);
+        devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: add (fw_event=0x%p)\n",
+            ioc->name, __func__, fw_event));
+        queue_delayed_work(ioc->fw_event_q, &fw_event->work,
+            delay);
         spin_unlock_irqrestore(&ioc->fw_event_lock, flags);
 }
 
@@ -306,11 +300,10 @@ mptsas_requeue_fw_event(MPT_ADAPTER *ioc, struct fw_event_work *fw_event,
         unsigned long flags;
         spin_lock_irqsave(&ioc->fw_event_lock, flags);
         devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT "%s: reschedule task "
-            "(fw_event=0x%p)on cpuid %d\n", ioc->name, __func__,
-                fw_event, smp_processor_id()));
+            "(fw_event=0x%p)\n", ioc->name, __func__, fw_event));
         fw_event->retries++;
-        queue_delayed_work_on(smp_processor_id(), ioc->fw_event_q,
-            &fw_event->work, msecs_to_jiffies(delay));
+        queue_delayed_work(ioc->fw_event_q, &fw_event->work,
+            msecs_to_jiffies(delay));
         spin_unlock_irqrestore(&ioc->fw_event_lock, flags);
 }
 
@@ -1950,15 +1943,6 @@ static enum blk_eh_timer_return mptsas_eh_timed_out(struct scsi_cmnd *sc)
                 goto done;
         }
 
-        /* In case if IOC is in reset from internal context.
-        *  Do not execute EEH for the same IOC. SML should to reset timer.
-        */
-        if (ioc->ioc_reset_in_progress) {
-                dtmprintk(ioc, printk(MYIOC_s_WARN_FMT ": %s: ioc is in reset,"
-                    "SML need to reset the timer (sc=%p)\n",
-                    ioc->name, __func__, sc));
-                rc = BLK_EH_RESET_TIMER;
-        }
         vdevice = sc->device->hostdata;
         if (vdevice && vdevice->vtarget && (vdevice->vtarget->inDMD
                 || vdevice->vtarget->deleted)) {
@@ -5158,8 +5142,6 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         ioc->TaskCtx = mptsasTaskCtx;
         ioc->InternalCtx = mptsasInternalCtx;
         ioc->schedule_target_reset = &mptsas_schedule_target_reset;
-        ioc->schedule_dead_ioc_flush_running_cmds =
-                                &mptscsih_flush_running_cmds;
         /*  Added sanity check on readiness of the MPT adapter.
          */
         if (ioc->last_state != MPI_IOC_STATE_OPERATIONAL) {
@@ -5257,21 +5239,6 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 sh->sg_tablesize = numSGE;
         }
 
-        if (mpt_loadtime_max_sectors) {
-                if (mpt_loadtime_max_sectors < 64 ||
-                        mpt_loadtime_max_sectors > 8192) {
-                        printk(MYIOC_s_INFO_FMT "Invalid value passed for"
-                                "mpt_loadtime_max_sectors %d."
-                                "Range from 64 to 8192\n", ioc->name,
-                                mpt_loadtime_max_sectors);
-                }
-                mpt_loadtime_max_sectors &=  0xFFFFFFFE;
-                dprintk(ioc, printk(MYIOC_s_DEBUG_FMT
-                        "Resetting max sector to %d from %d\n",
-                  ioc->name, mpt_loadtime_max_sectors, sh->max_sectors));
-                sh->max_sectors = mpt_loadtime_max_sectors;
-        }
-
         hd = shost_priv(sh);
         hd->ioc = ioc;
 
@@ -5332,7 +5299,7 @@ mptsas_shutdown(struct pci_dev *pdev)
         mptsas_cleanup_fw_event_q(ioc);
 }
 
-static void mptsas_remove(struct pci_dev *pdev)
+static void __devexit mptsas_remove(struct pci_dev *pdev)
 {
         MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
         struct mptsas_portinfo *p, *n;
@@ -5376,8 +5343,6 @@ static struct pci_device_id mptsas_pci_table[] = {
                 PCI_ANY_ID, PCI_ANY_ID },
         { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1078,
                 PCI_ANY_ID, PCI_ANY_ID },
-        { PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP,
-                PCI_ANY_ID, PCI_ANY_ID },
         {0}     /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(pci, mptsas_pci_table);
@@ -5387,7 +5352,7 @@ static struct pci_driver mptsas_driver = {
         .name           = "mptsas",
         .id_table       = mptsas_pci_table,
         .probe          = mptsas_probe,
-        .remove         = mptsas_remove,
+        .remove         = __devexit_p(mptsas_remove),
         .shutdown       = mptsas_shutdown,
 #ifdef CONFIG_PM
         .suspend        = mptscsih_suspend,
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 164afa71bba..ce61a576976 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -792,7 +792,6 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                          * than an unsolicited DID_ABORT.
                          */
                         sc->result = DID_RESET << 16;
-                        break;
 
                 case MPI_IOCSTATUS_SCSI_EXT_TERMINATED:         /* 0x004C */
                         if (ioc->bus_type == FC)
@@ -831,8 +830,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                                         if ((pScsiReq->CDB[0] == READ_6  && ((pScsiReq->CDB[1] & 0x02) == 0)) ||
                                             pScsiReq->CDB[0] == READ_10 ||
                                             pScsiReq->CDB[0] == READ_12 ||
-                                                (pScsiReq->CDB[0] == READ_16 &&
-                                                ((pScsiReq->CDB[1] & 0x02) == 0)) ||
+                                            pScsiReq->CDB[0] == READ_16 ||
                                             pScsiReq->CDB[0] == VERIFY  ||
                                             pScsiReq->CDB[0] == VERIFY_16) {
                                                 if (scsi_bufflen(sc) !=
@@ -1026,7 +1024,7 @@ out:
  *
  *      Must be called while new I/Os are being queued.
  */
-void
+static void
 mptscsih_flush_running_cmds(MPT_SCSI_HOST *hd)
 {
         MPT_ADAPTER *ioc = hd->ioc;
@@ -1057,7 +1055,6 @@ mptscsih_flush_running_cmds(MPT_SCSI_HOST *hd)
                 sc->scsi_done(sc);
         }
 }
-EXPORT_SYMBOL(mptscsih_flush_running_cmds);
 
 /*
  *      mptscsih_search_running_cmds - Delete any commands associated
@@ -1632,13 +1629,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun,
                 return 0;
         }
 
-        /* DOORBELL ACTIVE check is not required if
-        *  MPI_IOCFACTS_CAPABILITY_HIGH_PRI_Q is supported.
-        */
-
-        if (!((ioc->facts.IOCCapabilities & MPI_IOCFACTS_CAPABILITY_HIGH_PRI_Q)
-                 && (ioc->facts.MsgVersion >= MPI_VERSION_01_05)) &&
-                (ioc_raw_state & MPI_DOORBELL_ACTIVE)) {
+        if (ioc_raw_state & MPI_DOORBELL_ACTIVE) {
                 printk(MYIOC_s_WARN_FMT
                         "TaskMgmt type=%x: ioc_state: "
                         "DOORBELL_ACTIVE (0x%x)!\n",
@@ -1737,9 +1728,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun,
                 printk(MYIOC_s_WARN_FMT
                        "Issuing Reset from %s!! doorbell=0x%08x\n",
                        ioc->name, __func__, mpt_GetIocState(ioc, 0));
-                retval = (ioc->bus_type == SAS) ?
-                        mpt_HardResetHandler(ioc, CAN_SLEEP) :
-                        mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);
+                retval = mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);
                 mpt_free_msg_frame(ioc, mf);
         }
 
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index 43e75ff3992..45a5ff3eff6 100644
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -135,4 +135,3 @@ extern int mptscsih_is_phys_disk(MPT_ADAPTER *ioc, u8 channel, u8 id);
 extern struct device_attribute *mptscsih_host_attrs[];
 extern struct scsi_cmnd *mptscsih_get_scsi_lookup(MPT_ADAPTER *ioc, int i);
 extern void mptscsih_taskmgmt_response_code(MPT_ADAPTER *ioc, u8 response_code);
-extern void mptscsih_flush_running_cmds(MPT_SCSI_HOST *hd);
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index c3aabde2dc4..8f61ba6aac2 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -1550,7 +1550,7 @@ static struct pci_driver mptspi_driver = {
         .name           = "mptspi",
         .id_table       = mptspi_pci_table,
         .probe          = mptspi_probe,
-        .remove         = mptscsih_remove,
+        .remove         = __devexit_p(mptscsih_remove),
         .shutdown       = mptscsih_shutdown,
 #ifdef CONFIG_PM
         .suspend        = mptscsih_suspend,
diff --git a/drivers/message/i2o/README.ioctl b/drivers/message/i2o/README.ioctl
index 4a7d2ebdfc9..5fb195af43e 100644
--- a/drivers/message/i2o/README.ioctl
+++ b/drivers/message/i2o/README.ioctl
@@ -138,7 +138,7 @@ VI. Setting Parameters
 
    The return value is the size in bytes of the data written into
    ops->resbuf if no errors occur.  If an error occurs, -1 is returned 
-   and errno is set appropriately:
+   and errno is set appropriatly:
 
       EFAULT      Invalid user space pointer was passed
       ENXIO       Invalid IOP number
@@ -222,7 +222,7 @@ VIII. Downloading Software
    RETURNS
 
    This function returns 0 no errors occur. If an error occurs, -1 
-   is returned and errno is set appropriately:
+   is returned and errno is set appropriatly:
 
       EFAULT      Invalid user space pointer was passed
       ENXIO       Invalid IOP number
@@ -264,7 +264,7 @@ IX. Uploading Software
    RETURNS
 
    This function returns 0 if no errors occur.  If an error occurs, -1
-   is returned and errno is set appropriately:
+   is returned and errno is set appropriatly:
 
       EFAULT      Invalid user space pointer was passed
       ENXIO       Invalid IOP number
@@ -301,7 +301,7 @@ X. Removing Software
    RETURNS
 
    This function returns 0 if no errors occur.  If an error occurs, -1
-   is returned and errno is set appropriately:
+   is returned and errno is set appropriatly:
 
       EFAULT      Invalid user space pointer was passed
       ENXIO       Invalid IOP number
@@ -325,7 +325,7 @@ X. Validating Configuration
    RETURNS
 
    This function returns 0 if no erro occur.  If an error occurs, -1 is
-   returned and errno is set appropriately:
+   returned and errno is set appropriatly:
 
       ETIMEDOUT   Timeout waiting for reply message
       ENXIO       Invalid IOP number
@@ -360,7 +360,7 @@ XI. Configuration Dialog
    RETURNS
 
    This function returns 0 if no error occur. If an error occurs, -1
-   is returned and errno is set appropriately:
+   is returned and errno is set appropriatly:
 
       EFAULT      Invalid user space pointer was passed
       ENXIO       Invalid IOP number
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 49e86aed2bc..4796bbf0ae4 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -609,7 +609,7 @@ static int i2o_block_release(struct gendisk *disk, fmode_t mode)
         u8 operation;
 
         /*
-         * This is to deal with the case of an application
+         * This is to deail with the case of an application
          * opening a device and then the device disappears while
          * it's in use, and then the application tries to release
          * it.  ex: Unmounting a deleted RAID volume at reboot.
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 5451beff183..098de2b3578 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -188,13 +188,6 @@ static int i2o_cfg_parms(unsigned long arg, unsigned int type)
         if (!dev)
                 return -ENXIO;
 
-        /*
-         * Stop users being able to try and allocate arbitrary amounts
-         * of DMA space. 64K is way more than sufficient for this.
-         */
-        if (kcmd.oplen > 65536)
-                return -EMSGSIZE;
-
         ops = memdup_user(kcmd.opbuf, kcmd.oplen);
         if (IS_ERR(ops))
                 return PTR_ERR(ops);
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index 8001aa6bfb4..07dbeaf9df9 100644
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
@@ -56,7 +56,7 @@
 /* Structure used to define /proc entries */
 typedef struct _i2o_proc_entry_t {
         char *name;             /* entry name */
-        umode_t mode;           /* mode */
+        mode_t mode;            /* mode */
         const struct file_operations *fops;     /* open function */
 } i2o_proc_entry;
 
@@ -255,8 +255,9 @@ static char *scsi_devices[] = {
         "Array Controller Device"
 };
 
-static char *chtostr(char *tmp, u8 *chars, int n)
+static char *chtostr(u8 * chars, int n)
 {
+        char tmp[256];
         tmp[0] = 0;
         return strncat(tmp, (char *)chars, n);
 }
@@ -282,6 +283,7 @@ static char *bus_strings[] = {
         "Local Bus",
         "ISA",
         "EISA",
+        "MCA",
         "PCI",
         "PCMCIA",
         "NUBUS",
@@ -349,6 +351,18 @@ static int i2o_seq_show_hrt(struct seq_file *seq, void *v)
                                            EisaSlotNumber);
                                 break;
 
+                        case I2O_BUS_MCA:
+                                seq_printf(seq, "     IOBase: %0#6x,",
+                                           hrt->hrt_entry[i].bus.mca_bus.
+                                           McaBaseIOPort);
+                                seq_printf(seq, " MemoryBase: %0#10x,",
+                                           hrt->hrt_entry[i].bus.mca_bus.
+                                           McaBaseMemoryAddress);
+                                seq_printf(seq, " Slot: %0#4x,",
+                                           hrt->hrt_entry[i].bus.mca_bus.
+                                           McaSlotNumber);
+                                break;
+
                         case I2O_BUS_PCI:
                                 seq_printf(seq, "     Bus: %0#4x",
                                            hrt->hrt_entry[i].bus.pci_bus.
@@ -790,7 +804,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
         } *result;
 
         i2o_exec_execute_ddm_table ddm_table;
-        char tmp[28 + 1];
 
         result = kmalloc(sizeof(*result), GFP_KERNEL);
         if (!result)
@@ -826,7 +839,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
                 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
                 seq_printf(seq, "%-#8x", ddm_table.module_id);
                 seq_printf(seq, "%-29s",
-                           chtostr(tmp, ddm_table.module_name_version, 28));
+                           chtostr(ddm_table.module_name_version, 28));
                 seq_printf(seq, "%9d  ", ddm_table.data_size);
                 seq_printf(seq, "%8d", ddm_table.code_size);
 
@@ -893,7 +906,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
 
         i2o_driver_result_table *result;
         i2o_driver_store_table *dst;
-        char tmp[28 + 1];
 
         result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
         if (result == NULL)
@@ -928,9 +940,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
 
                 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
                 seq_printf(seq, "%-#8x", dst->module_id);
-                seq_printf(seq, "%-29s",
-                           chtostr(tmp, dst->module_name_version, 28));
-                seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
+                seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
+                seq_printf(seq, "%-9s", chtostr(dst->date, 8));
                 seq_printf(seq, "%8d ", dst->module_size);
                 seq_printf(seq, "%8d ", dst->mpb_size);
                 seq_printf(seq, "0x%04x", dst->module_flags);
@@ -1250,7 +1261,6 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
         // == (allow) 512d bytes (max)
         static u16 *work16 = (u16 *) work32;
         int token;
-        char tmp[16 + 1];
 
         token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
 
@@ -1263,13 +1273,13 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
         seq_printf(seq, "Owner TID     : %0#5x\n", work16[2]);
         seq_printf(seq, "Parent TID    : %0#5x\n", work16[3]);
         seq_printf(seq, "Vendor info   : %s\n",
-                   chtostr(tmp, (u8 *) (work32 + 2), 16));
+                   chtostr((u8 *) (work32 + 2), 16));
         seq_printf(seq, "Product info  : %s\n",
-                   chtostr(tmp, (u8 *) (work32 + 6), 16));
+                   chtostr((u8 *) (work32 + 6), 16));
         seq_printf(seq, "Description   : %s\n",
-                   chtostr(tmp, (u8 *) (work32 + 10), 16));
+                   chtostr((u8 *) (work32 + 10), 16));
         seq_printf(seq, "Product rev.  : %s\n",
-                   chtostr(tmp, (u8 *) (work32 + 14), 8));
+                   chtostr((u8 *) (work32 + 14), 8));
 
         seq_printf(seq, "Serial number : ");
         print_serial_number(seq, (u8 *) (work32 + 16),
@@ -1306,8 +1316,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
                 u8 pad[256];    // allow up to 256 byte (max) serial number
         } result;
 
-        char tmp[24 + 1];
-
         token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
 
         if (token < 0) {
@@ -1317,9 +1325,9 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
 
         seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
         seq_printf(seq, "Module name         : %s\n",
-                   chtostr(tmp, result.module_name, 24));
+                   chtostr(result.module_name, 24));
         seq_printf(seq, "Module revision     : %s\n",
-                   chtostr(tmp, result.module_rev, 8));
+                   chtostr(result.module_rev, 8));
 
         seq_printf(seq, "Serial number       : ");
         print_serial_number(seq, result.serial_number, sizeof(result) - 36);
@@ -1343,8 +1351,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
                 u8 instance_number[4];
         } result;
 
-        char tmp[64 + 1];
-
         token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
 
         if (token < 0) {
@@ -1353,13 +1359,13 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
         }
 
         seq_printf(seq, "Device name     : %s\n",
-                   chtostr(tmp, result.device_name, 64));
+                   chtostr(result.device_name, 64));
         seq_printf(seq, "Service name    : %s\n",
-                   chtostr(tmp, result.service_name, 64));
+                   chtostr(result.service_name, 64));
         seq_printf(seq, "Physical name   : %s\n",
-                   chtostr(tmp, result.physical_location, 64));
+                   chtostr(result.physical_location, 64));
         seq_printf(seq, "Instance number : %s\n",
-                   chtostr(tmp, result.instance_number, 4));
+                   chtostr(result.instance_number, 4));
 
         return 0;
 }
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index 1d31d7284cb..c8ed7b63fdf 100644
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -57,6 +57,7 @@
 #include <linux/scatterlist.h>
 
 #include <asm/dma.h>
+#include <asm/system.h>
 #include <asm/io.h>
 #include <linux/atomic.h>
 
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 0f9f3e1a2b6..73e4658af53 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -31,13 +31,12 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/i2o.h>
-#include <linux/module.h>
 #include "core.h"
 
 #define OSM_DESCRIPTION "I2O-subsystem"
 
 /* PCI device id table for all I2O controllers */
-static struct pci_device_id i2o_pci_ids[] = {
+static struct pci_device_id __devinitdata i2o_pci_ids[] = {
         {PCI_DEVICE_CLASS(PCI_CLASS_INTELLIGENT_I2O << 8, 0xffff00)},
         {PCI_DEVICE(PCI_VENDOR_ID_DPT, 0xa511)},
         {.vendor = PCI_VENDOR_ID_INTEL,.device = 0x1962,
@@ -84,7 +83,7 @@ static void i2o_pci_free(struct i2o_controller *c)
  *
  *      Returns 0 on success or negative error code on failure.
  */
-static int i2o_pci_alloc(struct i2o_controller *c)
+static int __devinit i2o_pci_alloc(struct i2o_controller *c)
 {
         struct pci_dev *pdev = c->pdev;
         struct device *dev = &pdev->dev;
@@ -315,7 +314,8 @@ static void i2o_pci_irq_disable(struct i2o_controller *c)
  *
  *      Returns 0 on success or negative error code on failure.
  */
-static int i2o_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+static int __devinit i2o_pci_probe(struct pci_dev *pdev,
+                                   const struct pci_device_id *id)
 {
         struct i2o_controller *c;
         int rc;
@@ -452,7 +452,7 @@ static int i2o_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
  *      Reset the I2O controller, disable interrupts and remove all allocated
  *      resources.
  */
-static void i2o_pci_remove(struct pci_dev *pdev)
+static void __devexit i2o_pci_remove(struct pci_dev *pdev)
 {
         struct i2o_controller *c;
         c = pci_get_drvdata(pdev);
@@ -473,7 +473,7 @@ static struct pci_driver i2o_pci_driver = {
         .name = "PCI_I2O",
         .id_table = i2o_pci_ids,
         .probe = i2o_pci_probe,
-        .remove = i2o_pci_remove,
+        .remove = __devexit_p(i2o_pci_remove),
 };
 
 /**