Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.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 59a6546..473a120 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -2724,7 +2724,7 @@ static int megasas_wait_for_outstanding(struct megasas_instance *instance)
        do {
                if ((fw_state == MFI_STATE_FAULT) || atomic_read(&instance->fw_outstanding)) {
                        dev_info(&instance->pdev->dev,
-                               "%s:%d waiting_for_outstanding: before issue OCR. FW state = 0x%x, oustanding 0x%x\n",
+                               "%s:%d waiting_for_outstanding: before issue OCR. FW state = 0x%x, outstanding 0x%x\n",
                                __func__, __LINE__, fw_state, atomic_read(&instance->fw_outstanding));
                        if (i == 3)
                                goto kill_hba_and_failed;
@@ -4647,7 +4647,7 @@ megasas_ld_list_query(struct megasas_instance *instance, u8 query_type)
  * Return:                     0 if DCMD succeeded
  *                              non-zero if failed
  */
-int
+static int
 megasas_host_device_list_query(struct megasas_instance *instance,
                               bool is_probe)
 {