Commit 73eba2be authored by Subhash Jadavani's avatar Subhash Jadavani Committed by Martin K. Petersen

scsi: ufs: fix arguments order some trace calls

Colin Ian King reported that with commit 7ff5ab47 ("scsi: ufs: add
tracing support") static analysis is reporting that we may have swapped
arguments on calls to:

    trace_ufshcd_runtime_resume,
    trace_ufshcd_runtime_suspend,
    trace_ufshcd_system_suspend,
    trace_ufshcd_system_resume,
and trace_ufshcd_init

Where:
    hba->uic_link_state is passed to dev_state
    hba->curr_dev_pwr_mode is passed to link_state

This wasn't intentional so it's a bug. This change fixed this bug.
Reported-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Acked-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2e48e349
...@@ -5803,7 +5803,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba) ...@@ -5803,7 +5803,7 @@ static int ufshcd_probe_hba(struct ufs_hba *hba)
trace_ufshcd_init(dev_name(hba->dev), ret, trace_ufshcd_init(dev_name(hba->dev), ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->uic_link_state, hba->curr_dev_pwr_mode); hba->curr_dev_pwr_mode, hba->uic_link_state);
return ret; return ret;
} }
...@@ -6817,7 +6817,7 @@ int ufshcd_system_suspend(struct ufs_hba *hba) ...@@ -6817,7 +6817,7 @@ int ufshcd_system_suspend(struct ufs_hba *hba)
out: out:
trace_ufshcd_system_suspend(dev_name(hba->dev), ret, trace_ufshcd_system_suspend(dev_name(hba->dev), ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->uic_link_state, hba->curr_dev_pwr_mode); hba->curr_dev_pwr_mode, hba->uic_link_state);
if (!ret) if (!ret)
hba->is_sys_suspended = true; hba->is_sys_suspended = true;
return ret; return ret;
...@@ -6850,7 +6850,7 @@ int ufshcd_system_resume(struct ufs_hba *hba) ...@@ -6850,7 +6850,7 @@ int ufshcd_system_resume(struct ufs_hba *hba)
out: out:
trace_ufshcd_system_resume(dev_name(hba->dev), ret, trace_ufshcd_system_resume(dev_name(hba->dev), ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->uic_link_state, hba->curr_dev_pwr_mode); hba->curr_dev_pwr_mode, hba->uic_link_state);
return ret; return ret;
} }
EXPORT_SYMBOL(ufshcd_system_resume); EXPORT_SYMBOL(ufshcd_system_resume);
...@@ -6878,7 +6878,7 @@ int ufshcd_runtime_suspend(struct ufs_hba *hba) ...@@ -6878,7 +6878,7 @@ int ufshcd_runtime_suspend(struct ufs_hba *hba)
out: out:
trace_ufshcd_runtime_suspend(dev_name(hba->dev), ret, trace_ufshcd_runtime_suspend(dev_name(hba->dev), ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->uic_link_state, hba->curr_dev_pwr_mode); hba->curr_dev_pwr_mode, hba->uic_link_state);
return ret; return ret;
} }
EXPORT_SYMBOL(ufshcd_runtime_suspend); EXPORT_SYMBOL(ufshcd_runtime_suspend);
...@@ -6919,7 +6919,7 @@ int ufshcd_runtime_resume(struct ufs_hba *hba) ...@@ -6919,7 +6919,7 @@ int ufshcd_runtime_resume(struct ufs_hba *hba)
out: out:
trace_ufshcd_runtime_resume(dev_name(hba->dev), ret, trace_ufshcd_runtime_resume(dev_name(hba->dev), ret,
ktime_to_us(ktime_sub(ktime_get(), start)), ktime_to_us(ktime_sub(ktime_get(), start)),
hba->uic_link_state, hba->curr_dev_pwr_mode); hba->curr_dev_pwr_mode, hba->uic_link_state);
return ret; return ret;
} }
EXPORT_SYMBOL(ufshcd_runtime_resume); EXPORT_SYMBOL(ufshcd_runtime_resume);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment