1 files changed, 14 insertions, 17 deletions

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)