[SCSI] mpt fusion: config path optimized, completion queue is used

1) 	Previously we had mutliple #defines to use same values.
	Now those #defines are optimized.
	MPT_IOCTL_STATUS_* is removed and  MPT_MGMT_STATUS_* are new
	#defines.
2.)	config path is optimized.
	Instead of wait Queue and timer, using completion Q.
3.)	mpt_timer_expired is not used.

[jejb: elide patch to eliminate mpt_timer_expired]
Signed-off-by: Kashyap Desai <kadesai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 40dbaaaf49e1..dc23adf9a30f 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -1122,9 +1122,9 @@ static int mptsas_get_linkerrors(struct sas_phy *phy)
 static int mptsas_mgmt_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req,
                 MPT_FRAME_HDR *reply)
 {
-        ioc->sas_mgmt.status |= MPT_SAS_MGMT_STATUS_COMMAND_GOOD;
+        ioc->sas_mgmt.status |= MPT_MGMT_STATUS_COMMAND_GOOD;
         if (reply != NULL) {
-                ioc->sas_mgmt.status |= MPT_SAS_MGMT_STATUS_RF_VALID;
+                ioc->sas_mgmt.status |= MPT_MGMT_STATUS_RF_VALID;
                 memcpy(ioc->sas_mgmt.reply, reply,
                     min(ioc->reply_sz, 4 * reply->u.reply.MsgLength));
         }
@@ -1182,7 +1182,7 @@ static int mptsas_phy_reset(struct sas_phy *phy, int hard_reset)
 
         /* a reply frame is expected */
         if ((ioc->sas_mgmt.status &
-            MPT_IOCTL_STATUS_RF_VALID) == 0) {
+            MPT_MGMT_STATUS_RF_VALID) == 0) {
                 error = -ENXIO;
                 goto out_unlock;
         }
@@ -1359,7 +1359,7 @@ static int mptsas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
         }
         mf = NULL;
 
-        if (ioc->sas_mgmt.status & MPT_IOCTL_STATUS_RF_VALID) {
+        if (ioc->sas_mgmt.status & MPT_MGMT_STATUS_RF_VALID) {
                 SmpPassthroughReply_t *smprep;
 
                 smprep = (SmpPassthroughReply_t *)ioc->sas_mgmt.reply;