drivers: Remove explicit invocations of mmiowb()

[linux.git] / drivers / scsi / megaraid / megaraid_sas_base.c

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index dace907744a5dc02edca5751441f97ff37432b12..59a6546fd602ab3fd24aec84b91d141824538267 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -815,7 +815,6 @@ megasas_fire_cmd_skinny(struct megasas_instance *instance,
               &(regs)->inbound_high_queue_port);
        writel((lower_32_bits(frame_phys_addr) | (frame_count<<1))|1,
               &(regs)->inbound_low_queue_port);
-       mmiowb();
        spin_unlock_irqrestore(&instance->hba_lock, flags);
 }
 
@@ -3924,12 +3923,12 @@ megasas_transition_to_ready(struct megasas_instance *instance, int ocr)
                /*
                 * The cur_state should not last for more than max_wait secs
                 */
-               for (i = 0; i < max_wait; i++) {
+               for (i = 0; i < max_wait * 50; i++) {
                        curr_abs_state = instance->instancet->
                                read_fw_status_reg(instance);
 
                        if (abs_state == curr_abs_state) {
-                               msleep(1000);
+                               msleep(20);
                        } else
                                break;
                }