Merge "drivers: msm: Fix a handful of compiler warnings" (3d79dbb0) · Commits · e / devices / android_kernel_sony_msm8994

drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_sync.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1184,7 +1184,7 @@ long __msm_jpeg_compat_ioctl(struct msm_jpeg_device *pgmn_dev,
		unsigned int cmd, unsigned long arg)
		{
		int rc = 0;
		struct msm_jpeg_ctrl_cmd *pctrl_cmd, ctrl_cmd;
		struct msm_jpeg_ctrl_cmd *pctrl_cmd = NULL, ctrl_cmd;
		struct msm_jpeg_buf jpeg_buf;
		mm_segment_t old_fs;

+4 −2

Original line number	Diff line number	Diff line
		@@ -626,14 +626,16 @@ static int smbchg_set_dc_current_max(struct smbchg_chip *chip, int current_ma)
		if (current_ma >= dc_current_table[i])
		break;
		}
		chip->dc_max_current_ma = dc_current_table[i];
		dc_cur_val = i & DCIN_INPUT_MASK;

		if (i < 0) {
		dev_err(chip->dev, "Cannot find %dma current_table\n",
		current_ma);
		return -EINVAL;
		}

		chip->dc_max_current_ma = dc_current_table[i];
		dc_cur_val = i & DCIN_INPUT_MASK;

		dev_dbg(chip->dev, "dc current set to %d mA\n",
		chip->dc_max_current_ma);
		return smbchg_sec_masked_write(chip, chip->dc_chgpth_base + IL_CFG,

+3 −0

Original line number	Diff line number	Diff line
		@@ -262,6 +262,9 @@ static int mem_acc_sel_setup(struct mem_acc_regulator *mem_acc_vreg,
		case MEMORY_L2:
		mem_select_str = "qcom,acc-sel-l2-bit-pos";
		break;
		default:
		pr_err("Invalid memory type: %d\n", mem_type);
		return -EINVAL;
		}

		rc = populate_acc_data(mem_acc_vreg, mem_select_str,

+3 −0

Original line number	Diff line number	Diff line
		@@ -1649,6 +1649,9 @@ static void msm_ufs_phy_calibrate(struct ufs_hba *hba)
		} else if ((major == 0x1) && (minor == 0x001) && (step == 0x0001)) {
		tbl_size = ARRAY_SIZE(phy_cal_table_ctrl_1_1_1_rate_A);
		tbl = phy_cal_table_ctrl_1_1_1_rate_A;
		} else {
		pr_err("%s: Unknown UFS controller type\n", __func__);
		return;
		}

		for (i = 0; i < tbl_size; i++)

+1 −1

Original line number	Diff line number	Diff line
		@@ -3082,7 +3082,7 @@ static int ufshcd_hba_enable(struct ufs_hba *hba)

		static int ufshcd_disable_tx_lcc(struct ufs_hba *hba, bool peer)
		{
		int tx_lanes, i, err;
		int tx_lanes, i, err = 0;

		if (!peer)
		ufshcd_dme_get(hba, UIC_ARG_MIB(PA_CONNECTEDTXDATALANES),