[SCSI] mpt fusion: standardize printks and debug info

Standardize all prints using common MYIOC_s_XXX_FMT macro defined in mptbase.h. Currently the driver uses several different methods to display info, where in some cases the "controller name" generating the printk is not provided.

Signed-off-by: Eric Moore <Eric.Moore@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index 0586f87ffb19..6c6299485f4e 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,
                         "DID_IMM_RETRY, deferring %s recovery.\n",
                         ((MPT_SCSI_HOST *) shost->hostdata)->ioc->name,
                         ((MPT_SCSI_HOST *) shost->hostdata)->ioc->sh->host_no,
-                        SCpnt->device->id,SCpnt->device->lun,caller));
+                        SCpnt->device->id, SCpnt->device->lun, caller));
                 msleep(1000);
                 spin_lock_irqsave(shost->host_lock, flags);
         }
@@ -216,7 +216,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt,
                         "port state %d, vdev %p.\n", caller,
                         ((MPT_SCSI_HOST *) shost->hostdata)->ioc->name,
                         ((MPT_SCSI_HOST *) shost->hostdata)->ioc->sh->host_no,
-                        SCpnt->device->id,SCpnt->device->lun,ready,
+                        SCpnt->device->id, SCpnt->device->lun, ready,
                         SCpnt->device->hostdata));
                 return FAILED;
         }
@@ -224,7 +224,7 @@ mptfc_block_error_handler(struct scsi_cmnd *SCpnt,
                 "%s.%d: %d:%d, executing recovery.\n", caller,
                 ((MPT_SCSI_HOST *) shost->hostdata)->ioc->name,
                 ((MPT_SCSI_HOST *) shost->hostdata)->ioc->sh->host_no,
-                SCpnt->device->id,SCpnt->device->lun));
+                SCpnt->device->id, SCpnt->device->lun));
         return (*func)(SCpnt);
 }
 
@@ -1320,8 +1320,8 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         sh->transportt = mptfc_transport_template;
         error = scsi_add_host (sh, &ioc->pcidev->dev);
         if(error) {
-                dprintk(ioc, printk(KERN_ERR MYNAM
-                  "scsi_add_host failed\n"));
+                dprintk(ioc, printk(MYIOC_s_ERR_FMT
+                  "scsi_add_host failed\n", ioc->name));
                 goto out_mptfc_probe;
         }