summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilad Broner <gbroner@codeaurora.org>2015-03-22 11:27:37 +0200
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 10:59:06 -0700
commit80cb9e5fe7c0892919ee8641b4ad29e0ca37b68f (patch)
tree54932a6bdb3276bf708c4acfce8aa951e0da46a4
parent57ef59d9b21d45408a35388c50614f128dd62183 (diff)
scsi: ufs: fix static code analysis issues
Running static code analysis tools on the UFS driver code reported a few issues: non-static functions, usage of pointer after is it freed and non-initialized variable. This change fixes these issues. Change-Id: I0bcc11b057033866fff07a70754fa1751dbc729c Signed-off-by: Gilad Broner <gbroner@codeaurora.org> [subhashj@codeaurora.org: resolved merge conflicts, skipped changes to ufs_test.c] Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
-rw-r--r--drivers/scsi/ufs/ufs-qcom-debugfs.c4
-rw-r--r--drivers/scsi/ufs/ufs_quirks.c3
-rw-r--r--drivers/scsi/ufs/ufshcd.c12
3 files changed, 10 insertions, 9 deletions
diff --git a/drivers/scsi/ufs/ufs-qcom-debugfs.c b/drivers/scsi/ufs/ufs-qcom-debugfs.c
index 0368f9805b8c..0576269491a4 100644
--- a/drivers/scsi/ufs/ufs-qcom-debugfs.c
+++ b/drivers/scsi/ufs/ufs-qcom-debugfs.c
@@ -111,9 +111,9 @@ static ssize_t ufs_qcom_dbg_testbus_cfg_write(struct file *file,
int major;
int minor;
- cnt = simple_write_to_buffer(configuration, TESTBUS_CFG_BUFF_LINE_SIZE,
+ ret = simple_write_to_buffer(configuration, TESTBUS_CFG_BUFF_LINE_SIZE,
&buff_pos, ubuf, cnt);
- if (cnt < 0) {
+ if (ret < 0) {
dev_err(host->hba->dev, "%s: failed to read user data\n",
__func__);
goto out;
diff --git a/drivers/scsi/ufs/ufs_quirks.c b/drivers/scsi/ufs/ufs_quirks.c
index a47dfba3243c..066c38df51b9 100644
--- a/drivers/scsi/ufs/ufs_quirks.c
+++ b/drivers/scsi/ufs/ufs_quirks.c
@@ -23,7 +23,8 @@ static struct ufs_card_fix ufs_fixups[] = {
END_FIX
};
-int ufs_get_device_info(struct ufs_hba *hba, struct ufs_card_info *card_data)
+static int ufs_get_device_info(struct ufs_hba *hba,
+ struct ufs_card_info *card_data)
{
int err;
u8 model_index;
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index f2cf4a659dae..356d0e0fef7a 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -1497,7 +1497,7 @@ static void ufshcd_exit_clk_gating(struct ufs_hba *hba)
*
* Return 0 on success, non-zero on failure.
*/
-int ufshcd_hibern8_hold(struct ufs_hba *hba, bool async)
+static int ufshcd_hibern8_hold(struct ufs_hba *hba, bool async)
{
int rc = 0;
unsigned long flags;
@@ -1602,7 +1602,7 @@ static void __ufshcd_hibern8_release(struct ufs_hba *hba, bool no_sched)
delay_in_jiffies);
}
-void ufshcd_hibern8_release(struct ufs_hba *hba, bool no_sched)
+static void ufshcd_hibern8_release(struct ufs_hba *hba, bool no_sched)
{
unsigned long flags;
@@ -3082,9 +3082,9 @@ out:
*
* Returns 0 for success, non-zero in case of failure
*/
-int ufshcd_query_attr_retry(struct ufs_hba *hba, enum query_opcode opcode,
- enum attr_idn idn, u8 index, u8 selector,
- u32 *attr_val)
+static int ufshcd_query_attr_retry(struct ufs_hba *hba,
+ enum query_opcode opcode, enum attr_idn idn, u8 index, u8 selector,
+ u32 *attr_val)
{
int ret = 0;
u32 retries;
@@ -8071,7 +8071,7 @@ static inline ssize_t ufshcd_pm_lvl_store(struct device *dev,
if (kstrtoul(buf, 0, &value))
return -EINVAL;
- if ((value < UFS_PM_LVL_0) || (value >= UFS_PM_LVL_MAX))
+ if (value >= UFS_PM_LVL_MAX)
return -EINVAL;
spin_lock_irqsave(hba->host->host_lock, flags);