1 files changed, 10 insertions, 13 deletions

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;