Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cebd075 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sensor: Disable excess logs"

parents 3961e0ef a48dd8bb

drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c

+2 −2
Original line number Diff line number Diff line
@@ -1932,7 +1932,7 @@ static int msm_cci_get_clk_info(struct cci_device *cci_dev, 
			rc = of_property_read_string_index(of_node,

				"clock-names", j,

				&(cci_clk_info[i][j].clk_name));

			pr_err("%s: clock-names[%d][%d] = %s\n", __func__,

			CDBG("%s: clock-names[%d][%d] = %s\n", __func__,

				i, j, cci_clk_info[i][j].clk_name);

			if (rc < 0) {

				pr_err("%s:%d, failed\n", __func__, __LINE__);
@@ -1942,7 +1942,7 @@ static int msm_cci_get_clk_info(struct cci_device *cci_dev, 
			cci_clk_info[i][j].clk_rate =

				(be32_to_cpu(p[index]) == 0) ?

					(long)-1 : be32_to_cpu(p[index]);

			pr_err("%s: clk_rate[%d][%d] = %ld\n", __func__, i, j,

			CDBG("%s: clk_rate[%d][%d] = %ld\n", __func__, i, j,

				cci_clk_info[i][j].clk_rate);

			index++;

		}

drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int msm_eeprom_parse_memory_map(struct device_node *of, 
		rc = of_property_read_u32_array(of, property,

			(uint32_t *) &map[i].pageen, count);

		if (rc < 0)

			pr_err("%s: pageen not needed\n", __func__);

			CDBG("%s: pageen not needed\n", __func__);



		snprintf(property, PROPERTY_MAXSIZE, "qcom,saddr%d", i);

		rc = of_property_read_u32_array(of, property,

drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_dt_util.c

+10 −10
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg, 
		case CAM_VDIG:

			for (j = 0; j < num_vreg; j++) {

				if (!strcmp(cam_vreg[j].reg_name, "cam_vdig")) {

					pr_err("%s:%d i %d j %d cam_vdig\n",

					CDBG("%s:%d i %d j %d cam_vdig\n",

						__func__, __LINE__, i, j);

					power_setting[i].seq_val = j;

					if (VALIDATE_VOLTAGE(
@@ -74,7 +74,7 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg, 
		case CAM_VIO:

			for (j = 0; j < num_vreg; j++) {

				if (!strcmp(cam_vreg[j].reg_name, "cam_vio")) {

					pr_err("%s:%d i %d j %d cam_vio\n",

					CDBG("%s:%d i %d j %d cam_vio\n",

						__func__, __LINE__, i, j);

					power_setting[i].seq_val = j;

					if (VALIDATE_VOLTAGE(
@@ -95,7 +95,7 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg, 
		case CAM_VANA:

			for (j = 0; j < num_vreg; j++) {

				if (!strcmp(cam_vreg[j].reg_name, "cam_vana")) {

					pr_err("%s:%d i %d j %d cam_vana\n",

					CDBG("%s:%d i %d j %d cam_vana\n",

						__func__, __LINE__, i, j);

					power_setting[i].seq_val = j;

					if (VALIDATE_VOLTAGE(
@@ -116,7 +116,7 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg, 
		case CAM_VAF:

			for (j = 0; j < num_vreg; j++) {

				if (!strcmp(cam_vreg[j].reg_name, "cam_vaf")) {

					pr_err("%s:%d i %d j %d cam_vaf\n",

					CDBG("%s:%d i %d j %d cam_vaf\n",

						__func__, __LINE__, i, j);

					power_setting[i].seq_val = j;

					if (VALIDATE_VOLTAGE(
@@ -138,7 +138,7 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg, 
			for (j = 0; j < num_vreg; j++) {

				if (!strcmp(cam_vreg[j].reg_name,

					"cam_v_custom1")) {

					pr_err("%s:%d i %d j %d cam_vcustom1\n",

					CDBG("%s:%d i %d j %d cam_vcustom1\n",

						__func__, __LINE__, i, j);

					power_setting[i].seq_val = j;

					if (VALIDATE_VOLTAGE(
@@ -160,7 +160,7 @@ int msm_camera_fill_vreg_params(struct camera_vreg_t *cam_vreg, 
			for (j = 0; j < num_vreg; j++) {

				if (!strcmp(cam_vreg[j].reg_name,

					"cam_v_custom2")) {

					pr_err("%s:%d i %d j %d cam_vcustom2\n",

					CDBG("%s:%d i %d j %d cam_vcustom2\n",

						__func__, __LINE__, i, j);

					power_setting[i].seq_val = j;

					if (VALIDATE_VOLTAGE(
@@ -1182,7 +1182,7 @@ int msm_camera_get_dt_vreg_data(struct device_node *of_node, 
			}

		}

	} else {

		pr_err("%s:%d no qcom,cam-vreg-type entries in dts\n",

		CDBG("%s:%d no qcom,cam-vreg-type entries in dts\n",

			__func__, __LINE__);

		rc = 0;

	}
@@ -1201,7 +1201,7 @@ int msm_camera_get_dt_vreg_data(struct device_node *of_node, 
			}

		}

	} else {

		pr_err("%s:%d no qcom,cam-vreg-min-voltage entries in dts\n",

		CDBG("%s:%d no qcom,cam-vreg-min-voltage entries in dts\n",

			__func__, __LINE__);

		rc = 0;

	}
@@ -1220,7 +1220,7 @@ int msm_camera_get_dt_vreg_data(struct device_node *of_node, 
			}

		}

	} else {

		pr_err("%s:%d no qcom,cam-vreg-max-voltage entries in dts\n",

		CDBG("%s:%d no qcom,cam-vreg-max-voltage entries in dts\n",

			__func__, __LINE__);

		rc = 0;

	}
@@ -1239,7 +1239,7 @@ int msm_camera_get_dt_vreg_data(struct device_node *of_node, 
			}

		}

	} else {

		pr_err("%s:%d no qcom,cam-vreg-op-mode entries in dts\n",

		CDBG("%s:%d no qcom,cam-vreg-op-mode entries in dts\n",

			__func__, __LINE__);

		rc = 0;

	}