Merge commit 'v3.17' into next

10 files changed, 76 insertions, 98 deletions

diff --git a/drivers/message/fusion/Kconfig b/drivers/message/fusion/Kconfig
index a34a11d2fef2..63ca9841db10 100644
--- a/drivers/message/fusion/Kconfig
+++ b/drivers/message/fusion/Kconfig
@@ -29,7 +29,7 @@ config FUSION_SPI
 config FUSION_FC
         tristate "Fusion MPT ScsiHost drivers for FC"
         depends on PCI && SCSI
-        select SCSI_FC_ATTRS
+        depends on SCSI_FC_ATTRS
         ---help---
           SCSI HOST support for a Fiber Channel host adapters.
 
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index ebc0af7d769c..a896d948b79e 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -649,12 +649,10 @@ mptbase_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, MPT_FRAME_HDR *reply)
         case MPI_FUNCTION_CONFIG:
         case MPI_FUNCTION_SAS_IO_UNIT_CONTROL:
                 ioc->mptbase_cmds.status |= MPT_MGMT_STATUS_COMMAND_GOOD;
-                if (reply) {
-                        ioc->mptbase_cmds.status |= MPT_MGMT_STATUS_RF_VALID;
-                        memcpy(ioc->mptbase_cmds.reply, reply,
-                            min(MPT_DEFAULT_FRAME_SIZE,
-                                4 * reply->u.reply.MsgLength));
-                }
+                ioc->mptbase_cmds.status |= MPT_MGMT_STATUS_RF_VALID;
+                memcpy(ioc->mptbase_cmds.reply, reply,
+                    min(MPT_DEFAULT_FRAME_SIZE,
+                        4 * reply->u.reply.MsgLength));
                 if (ioc->mptbase_cmds.status & MPT_MGMT_STATUS_PENDING) {
                         ioc->mptbase_cmds.status &= ~MPT_MGMT_STATUS_PENDING;
                         complete(&ioc->mptbase_cmds.done);
@@ -1408,8 +1406,8 @@ mpt_verify_adapter(int iocid, MPT_ADAPTER **iocpp)
  *      in /proc/mpt/summary and /sysfs/class/scsi_host/host<X>/version_product
  *
  **/
-static void
-mpt_get_product_name(u16 vendor, u16 device, u8 revision, char *prod_name)
+static const char*
+mpt_get_product_name(u16 vendor, u16 device, u8 revision)
 {
         char *product_str = NULL;
 
@@ -1635,8 +1633,7 @@ mpt_get_product_name(u16 vendor, u16 device, u8 revision, char *prod_name)
         }
 
  out:
-        if (product_str)
-                sprintf(prod_name, "%s", product_str);
+        return product_str;
 }
 
 /**
@@ -1887,8 +1884,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);
+        ioc->prod_name = mpt_get_product_name(pdev->vendor, pdev->device,
+                                              pdev->revision);
 
         switch (pdev->device)
         {
@@ -7007,7 +7004,7 @@ EXPORT_SYMBOL(mpt_halt_firmware);
  *      IOC doesn't reply to any outstanding request. This will transfer IOC
  *      to READY state.
  **/
-int
+static int
 mpt_SoftResetHandler(MPT_ADAPTER *ioc, int sleepFlag)
 {
         int              rc;
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index 76c05bc24cb7..8f14090b8b71 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -405,7 +405,7 @@ typedef struct _VirtTarget {
 typedef struct _VirtDevice {
         VirtTarget              *vtarget;
         u8                       configured_lun;
-        int                      lun;
+        u64                      lun;
 } VirtDevice;
 
 /*
@@ -605,7 +605,7 @@ typedef struct _MPT_ADAPTER
         int                      id;            /* Unique adapter id N {0,1,2,...} */
         int                      pci_irq;       /* This irq           */
         char                     name[MPT_NAME_LENGTH]; /* "iocN"             */
-        char                     prod_name[MPT_NAME_LENGTH];    /* "LSIFC9x9"         */
+        const char               *prod_name;    /* "LSIFC9x9"         */
 #ifdef CONFIG_FUSION_LOGGING
         /* used in mpt_display_event_info */
         char                     evStr[EVENT_DESCR_STR_SZ];
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 8a050e885688..b0a892a2bf1b 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1261,19 +1261,11 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
         else
                 return -EFAULT;
 
-        karg = kmalloc(data_size, GFP_KERNEL);
-        if (karg == NULL) {
-                printk(KERN_ERR MYNAM "%s::mpt_ioctl_iocinfo() @%d - no memory available!\n",
-                                __FILE__, __LINE__);
-                return -ENOMEM;
-        }
-
-        if (copy_from_user(karg, uarg, data_size)) {
-                printk(KERN_ERR MYNAM "%s@%d::mptctl_getiocinfo - "
-                        "Unable to read in mpt_ioctl_iocinfo struct @ %p\n",
-                                __FILE__, __LINE__, uarg);
-                kfree(karg);
-                return -EFAULT;
+        karg = memdup_user(uarg, data_size);
+        if (IS_ERR(karg)) {
+                printk(KERN_ERR MYNAM "%s@%d::mpt_ioctl_iocinfo() - memdup_user returned error [%ld]\n",
+                                __FILE__, __LINE__, PTR_ERR(karg));
+                return PTR_ERR(karg);
         }
 
         if (((iocnum = mpt_verify_adapter(karg->hdr.iocnum, &ioc)) < 0) ||
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index 02a3eefd6931..d8bf84aef602 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -204,7 +204,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt,
          || (loops > 0 && ioc->active == 0)) {
                 spin_unlock_irqrestore(shost->host_lock, flags);
                 dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT
-                        "mptfc_block_error_handler.%d: %d:%d, port status is "
+                        "mptfc_block_error_handler.%d: %d:%llu, port status is "
                         "%x, active flag %d, deferring %s recovery.\n",
                         ioc->name, ioc->sh->host_no,
                         SCpnt->device->id, SCpnt->device->lun,
@@ -218,7 +218,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt,
         if (ready == DID_NO_CONNECT || !SCpnt->device->hostdata
          || ioc->active == 0) {
                 dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT
-                        "%s.%d: %d:%d, failing recovery, "
+                        "%s.%d: %d:%llu, failing recovery, "
                         "port state %x, active %d, vdevice %p.\n", caller,
                         ioc->name, ioc->sh->host_no,
                         SCpnt->device->id, SCpnt->device->lun, ready,
@@ -226,7 +226,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt,
                 return FAILED;
         }
         dfcprintk (ioc, printk(MYIOC_s_DEBUG_FMT
-                "%s.%d: %d:%d, executing recovery.\n", caller,
+                "%s.%d: %d:%llu, executing recovery.\n", caller,
                 ioc->name, ioc->sh->host_no,
                 SCpnt->device->id, SCpnt->device->lun));
         return (*func)(SCpnt);
@@ -525,8 +525,7 @@ mptfc_target_destroy(struct scsi_target *starget)
                 if (ri) /* better be! */
                         ri->starget = NULL;
         }
-        if (starget->hostdata)
-                kfree(starget->hostdata);
+        kfree(starget->hostdata);
         starget->hostdata = NULL;
 }
 
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 711fcb5cec87..0707fa2c701b 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -990,11 +990,10 @@ mptsas_queue_device_delete(MPT_ADAPTER *ioc,
         MpiEventDataSasDeviceStatusChange_t *sas_event_data)
 {
         struct fw_event_work *fw_event;
-        int sz;
 
-        sz = offsetof(struct fw_event_work, event_data) +
-            sizeof(MpiEventDataSasDeviceStatusChange_t);
-        fw_event = kzalloc(sz, GFP_ATOMIC);
+        fw_event = kzalloc(sizeof(*fw_event) +
+                           sizeof(MpiEventDataSasDeviceStatusChange_t),
+                           GFP_ATOMIC);
         if (!fw_event) {
                 printk(MYIOC_s_WARN_FMT "%s: failed at (line=%d)\n",
                     ioc->name, __func__, __LINE__);
@@ -1011,10 +1010,8 @@ static void
 mptsas_queue_rescan(MPT_ADAPTER *ioc)
 {
         struct fw_event_work *fw_event;
-        int sz;
 
-        sz = offsetof(struct fw_event_work, event_data);
-        fw_event = kzalloc(sz, GFP_ATOMIC);
+        fw_event = kzalloc(sizeof(*fw_event), GFP_ATOMIC);
         if (!fw_event) {
                 printk(MYIOC_s_WARN_FMT "%s: failed at (line=%d)\n",
                     ioc->name, __func__, __LINE__);
@@ -1206,27 +1203,28 @@ mptsas_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
             "(mf = %p, mr = %p)\n", ioc->name, mf, mr));
 
         pScsiTmReply = (SCSITaskMgmtReply_t *)mr;
-        if (pScsiTmReply) {
-                dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT
-                    "\tTaskMgmt completed: fw_channel = %d, fw_id = %d,\n"
-                    "\ttask_type = 0x%02X, iocstatus = 0x%04X "
-                    "loginfo = 0x%08X,\n\tresponse_code = 0x%02X, "
-                    "term_cmnds = %d\n", ioc->name,
-                    pScsiTmReply->Bus, pScsiTmReply->TargetID,
-                    pScsiTmReply->TaskType,
-                    le16_to_cpu(pScsiTmReply->IOCStatus),
-                    le32_to_cpu(pScsiTmReply->IOCLogInfo),
-                    pScsiTmReply->ResponseCode,
-                    le32_to_cpu(pScsiTmReply->TerminationCount)));
-
-                if (pScsiTmReply->ResponseCode)
-                        mptscsih_taskmgmt_response_code(ioc,
-                        pScsiTmReply->ResponseCode);
-        }
-
-        if (pScsiTmReply && (pScsiTmReply->TaskType ==
+        if (!pScsiTmReply)
+                return 0;
+
+        dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT
+            "\tTaskMgmt completed: fw_channel = %d, fw_id = %d,\n"
+            "\ttask_type = 0x%02X, iocstatus = 0x%04X "
+            "loginfo = 0x%08X,\n\tresponse_code = 0x%02X, "
+            "term_cmnds = %d\n", ioc->name,
+            pScsiTmReply->Bus, pScsiTmReply->TargetID,
+            pScsiTmReply->TaskType,
+            le16_to_cpu(pScsiTmReply->IOCStatus),
+            le32_to_cpu(pScsiTmReply->IOCLogInfo),
+            pScsiTmReply->ResponseCode,
+            le32_to_cpu(pScsiTmReply->TerminationCount)));
+
+        if (pScsiTmReply->ResponseCode)
+                mptscsih_taskmgmt_response_code(ioc,
+                pScsiTmReply->ResponseCode);
+
+        if (pScsiTmReply->TaskType ==
             MPI_SCSITASKMGMT_TASKTYPE_QUERY_TASK || pScsiTmReply->TaskType ==
-             MPI_SCSITASKMGMT_TASKTYPE_ABRT_TASK_SET)) {
+             MPI_SCSITASKMGMT_TASKTYPE_ABRT_TASK_SET) {
                 ioc->taskmgmt_cmds.status |= MPT_MGMT_STATUS_COMMAND_GOOD;
                 ioc->taskmgmt_cmds.status |= MPT_MGMT_STATUS_RF_VALID;
                 memcpy(ioc->taskmgmt_cmds.reply, mr,
@@ -1575,7 +1573,7 @@ mptsas_del_end_device(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info)
         mptsas_port_delete(ioc, phy_info->port_details);
 }
 
-struct mptsas_phyinfo *
+static struct mptsas_phyinfo *
 mptsas_refreshing_device_handles(MPT_ADAPTER *ioc,
         struct mptsas_devinfo *sas_device)
 {
@@ -3648,7 +3646,7 @@ mptsas_send_expander_event(struct fw_event_work *fw_event)
  * @handle:
  *
  */
-struct mptsas_portinfo *
+static struct mptsas_portinfo *
 mptsas_expander_add(MPT_ADAPTER *ioc, u16 handle)
 {
         struct mptsas_portinfo buffer, *port_info;
@@ -3763,7 +3761,7 @@ mptsas_send_link_status_event(struct fw_event_work *fw_event)
                                                 printk(MYIOC_s_DEBUG_FMT
                                                 "SDEV OUTSTANDING CMDS"
                                                 "%d\n", ioc->name,
-                                                sdev->device_busy));
+                                                atomic_read(&sdev->device_busy)));
                                 }
 
                         }
@@ -3856,10 +3854,8 @@ retry_page:
                         phy_info = mptsas_find_phyinfo_by_sas_address(ioc,
                                         sas_info->sas_address);
 
-                        if (phy_info) {
-                                mptsas_del_end_device(ioc, phy_info);
-                                goto redo_device_scan;
-                        }
+                        mptsas_del_end_device(ioc, phy_info);
+                        goto redo_device_scan;
                 } else
                         mptsas_volume_delete(ioc, sas_info->fw.id);
         }
@@ -3870,9 +3866,8 @@ retry_page:
  redo_expander_scan:
         list_for_each_entry(port_info, &ioc->sas_topology, list) {
 
-                if (port_info->phy_info &&
-                    (!(port_info->phy_info[0].identify.device_info &
-                    MPI_SAS_DEVICE_INFO_SMP_TARGET)))
+                if (!(port_info->phy_info[0].identify.device_info &
+                    MPI_SAS_DEVICE_INFO_SMP_TARGET))
                         continue;
                 found_expander = 0;
                 handle = 0xFFFF;
@@ -4983,7 +4978,7 @@ static int
 mptsas_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *reply)
 {
         u32 event = le32_to_cpu(reply->Event);
-        int sz, event_data_sz;
+        int event_data_sz;
         struct fw_event_work *fw_event;
         unsigned long delay;
 
@@ -5093,8 +5088,7 @@ mptsas_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *reply)
 
         event_data_sz = ((reply->MsgLength * 4) -
             offsetof(EventNotificationReply_t, Data));
-        sz = offsetof(struct fw_event_work, event_data) + event_data_sz;
-        fw_event = kzalloc(sz, GFP_ATOMIC);
+        fw_event = kzalloc(sizeof(*fw_event) + event_data_sz, GFP_ATOMIC);
         if (!fw_event) {
                 printk(MYIOC_s_WARN_FMT "%s: failed at (line=%d)\n", ioc->name,
                  __func__, __LINE__);
@@ -5321,7 +5315,7 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         return error;
 }
 
-void
+static void
 mptsas_shutdown(struct pci_dev *pdev)
 {
         MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
diff --git a/drivers/message/fusion/mptsas.h b/drivers/message/fusion/mptsas.h
index 57e86ab77661..c396483d3624 100644
--- a/drivers/message/fusion/mptsas.h
+++ b/drivers/message/fusion/mptsas.h
@@ -110,7 +110,7 @@ struct fw_event_work {
         MPT_ADAPTER     *ioc;
         u32                     event;
         u8                      retries;
-        u8                      __attribute__((aligned(4))) event_data[1];
+        char                    event_data[0] __aligned(4);
 };
 
 struct mptsas_discovery_event {
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 2a1c6f21af27..e7dcb2583369 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -95,7 +95,7 @@ static void	mptscsih_freeChainBuffers(MPT_ADAPTER *ioc, int req_idx);
 static void     mptscsih_copy_sense_data(struct scsi_cmnd *sc, MPT_SCSI_HOST *hd, MPT_FRAME_HDR *mf, SCSIIOReply_t *pScsiReply);
 
 int     mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id,
-                int lun, int ctx2abort, ulong timeout);
+                u64 lun, int ctx2abort, ulong timeout);
 
 int             mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset);
 int             mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply);
@@ -536,7 +536,7 @@ mptscsih_info_scsiio(MPT_ADAPTER *ioc, struct scsi_cmnd *sc, SCSIIOReply_t * pSc
         }
 
         scsi_print_command(sc);
-        printk(MYIOC_s_DEBUG_FMT "\tfw_channel = %d, fw_id = %d, lun = %d\n",
+        printk(MYIOC_s_DEBUG_FMT "\tfw_channel = %d, fw_id = %d, lun = %llu\n",
             ioc->name, pScsiReply->Bus, pScsiReply->TargetID, sc->device->lun);
         printk(MYIOC_s_DEBUG_FMT "\trequest_len = %d, underflow = %d, "
             "resid = %d\n", ioc->name, scsi_bufflen(sc), sc->underflow,
@@ -692,7 +692,7 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                  */
                 if (scsi_state & MPI_SCSI_STATE_RESPONSE_INFO_VALID &&
                     pScsiReply->ResponseInfo) {
-                        printk(MYIOC_s_NOTE_FMT "[%d:%d:%d:%d] "
+                        printk(MYIOC_s_NOTE_FMT "[%d:%d:%d:%llu] "
                         "FCP_ResponseInfo=%08xh\n", ioc->name,
                         sc->device->host->host_no, sc->device->channel,
                         sc->device->id, sc->device->lun,
@@ -1155,7 +1155,7 @@ mptscsih_report_queue_full(struct scsi_cmnd *sc, SCSIIOReply_t *pScsiReply, SCSI
                 return;
         ioc = hd->ioc;
         if (time - hd->last_queue_full > 10 * HZ) {
-                dprintk(ioc, printk(MYIOC_s_WARN_FMT "Device (%d:%d:%d) reported QUEUE_FULL!\n",
+                dprintk(ioc, printk(MYIOC_s_WARN_FMT "Device (%d:%d:%llu) reported QUEUE_FULL!\n",
                                 ioc->name, 0, sc->device->id, sc->device->lun));
                 hd->last_queue_full = time;
         }
@@ -1271,15 +1271,13 @@ mptscsih_info(struct Scsi_Host *SChost)
 
         h = shost_priv(SChost);
 
-        if (h) {
-                if (h->info_kbuf == NULL)
-                        if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
-                                return h->info_kbuf;
-                h->info_kbuf[0] = '\0';
+        if (h->info_kbuf == NULL)
+                if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
+                        return h->info_kbuf;
+        h->info_kbuf[0] = '\0';
 
-                mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
-                h->info_kbuf[size-1] = '\0';
-        }
+        mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
+        h->info_kbuf[size-1] = '\0';
 
         return h->info_kbuf;
 }
@@ -1368,8 +1366,7 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt)
         /* Default to untagged. Once a target structure has been allocated,
          * use the Inquiry data to determine if device supports tagged.
          */
-        if (vdevice
-            && (vdevice->vtarget->tflags & MPT_TARGET_FLAGS_Q_YES)
+        if ((vdevice->vtarget->tflags & MPT_TARGET_FLAGS_Q_YES)
             && (SCpnt->device->tagged_supported)) {
                 scsictl = scsidir | MPI_SCSIIO_CONTROL_SIMPLEQ;
                 if (SCpnt->request && SCpnt->request->ioprio) {
@@ -1518,7 +1515,7 @@ mptscsih_freeChainBuffers(MPT_ADAPTER *ioc, int req_idx)
  *
  **/
 int
-mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun,
+mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, u64 lun,
         int ctx2abort, ulong timeout)
 {
         MPT_FRAME_HDR   *mf;
@@ -2380,7 +2377,7 @@ mptscsih_slave_configure(struct scsi_device *sdev)
         vdevice = sdev->hostdata;
 
         dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT
-                "device @ %p, channel=%d, id=%d, lun=%d\n",
+                "device @ %p, channel=%d, id=%d, lun=%llu\n",
                 ioc->name, sdev, sdev->channel, sdev->id, sdev->lun));
         if (ioc->bus_type == SPI)
                 dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT
@@ -2971,7 +2968,7 @@ mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *io)
                                            + (my_idx * MPT_SENSE_BUFFER_ALLOC));
 
         devtprintk(ioc, printk(MYIOC_s_DEBUG_FMT
-            "%s: Sending Command 0x%02x for fw_channel=%d fw_id=%d lun=%d\n",
+            "%s: Sending Command 0x%02x for fw_channel=%d fw_id=%d lun=%llu\n",
             ioc->name, __func__, cmd, io->channel, io->id, io->lun));
 
         if (dir == MPI_SCSIIO_CONTROL_READ)
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index 99e3390807f3..e1b1a198a62a 100644
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -98,7 +98,7 @@ typedef struct _internal_cmd {
         u8              cmd;            /* SCSI Op Code */
         u8              channel;        /* bus number */
         u8              id;             /* SCSI ID (virtual) */
-        int             lun;
+        u64             lun;
         u8              flags;          /* Bit Field - See above */
         u8              physDiskNum;    /* Phys disk number, -1 else */
         u8              rsvd2;
@@ -115,7 +115,7 @@ extern int mptscsih_show_info(struct seq_file *, struct Scsi_Host *);
 extern const char * mptscsih_info(struct Scsi_Host *SChost);
 extern int mptscsih_qcmd(struct scsi_cmnd *SCpnt);
 extern int mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel,
-        u8 id, int lun, int ctx2abort, ulong timeout);
+        u8 id, u64 lun, int ctx2abort, ulong timeout);
 extern void mptscsih_slave_destroy(struct scsi_device *device);
 extern int mptscsih_slave_configure(struct scsi_device *device);
 extern int mptscsih_abort(struct scsi_cmnd * SCpnt);
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 49d11338294b..787933d43d32 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -461,8 +461,7 @@ static int mptspi_target_alloc(struct scsi_target *starget)
 static void
 mptspi_target_destroy(struct scsi_target *starget)
 {
-        if (starget->hostdata)
-                kfree(starget->hostdata);
+        kfree(starget->hostdata);
         starget->hostdata = NULL;
 }
 
@@ -620,7 +619,7 @@ static void mptspi_read_parameters(struct scsi_target *starget)
         spi_width(starget) = (nego & MPI_SCSIDEVPAGE0_NP_WIDE) ? 1 : 0;
 }
 
-int
+static int
 mptscsih_quiesce_raid(MPT_SCSI_HOST *hd, int quiesce, u8 channel, u8 id)
 {
         MPT_ADAPTER     *ioc = hd->ioc;