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

Commit 30bff294 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: remove unnecessary logs"

parents bfa1f165 40e78f86

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

+1 −1
Original line number Diff line number Diff line
@@ -1220,7 +1220,7 @@ static int msm_cci_probe(struct platform_device *pdev) 
{

	struct cci_device *new_cci_dev;

	int rc = 0;

	pr_err("%s: pdev %p device id = %d\n", __func__, pdev, pdev->id);

	CDBG("%s: pdev %p device id = %d\n", __func__, pdev, pdev->id);

	new_cci_dev = kzalloc(sizeof(struct cci_device), GFP_KERNEL);

	if (!new_cci_dev) {

		CDBG("%s: no enough memory\n", __func__);

drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c

+2 −2
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ static int msm_sensor_config32(struct msm_sensor_ctrl_t *s_ctrl, 
				break;

			}

			s_ctrl->sensor_state = MSM_SENSOR_POWER_UP;

			pr_err("%s:%d sensor state %d\n", __func__, __LINE__,

			CDBG("%s:%d sensor state %d\n", __func__, __LINE__,

				s_ctrl->sensor_state);

		} else {

			rc = -EFAULT;
@@ -743,7 +743,7 @@ static int msm_sensor_config32(struct msm_sensor_ctrl_t *s_ctrl, 
				break;

			}

			s_ctrl->sensor_state = MSM_SENSOR_POWER_DOWN;

			pr_err("%s:%d sensor state %d\n", __func__, __LINE__,

			CDBG("%s:%d sensor state %d\n", __func__, __LINE__,

				s_ctrl->sensor_state);

		} else {

			rc = -EFAULT;

drivers/media/platform/msm/camera_v2/sensor/msm_sensor_init.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static int msm_sensor_wait_for_probe_done(struct msm_sensor_init_t *s_init) 
	int rc;

	int tm = 10000;

	if (s_init->module_init_status == 1) {

		pr_err("msm_cam_get_module_init_status -2\n");

		CDBG("msm_cam_get_module_init_status -2\n");

		return 0;

	}

	rc = wait_event_interruptible_timeout(s_init->state_wait,
@@ -161,7 +161,7 @@ static int __init msm_sensor_init_module(void) 
		return -ENOMEM;

	}



	pr_err("MSM_SENSOR_INIT_MODULE %p", NULL);

	CDBG("MSM_SENSOR_INIT_MODULE %p", NULL);



	/* Initialize mutex */

	mutex_init(&s_init->imutex);