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

Commit 5a1ae56f authored by Suresh Vankadara's avatar Suresh Vankadara Committed by Lakshmi Narayana Kalavala
Browse files

msm: camera: icp: Changes for cleanup ICP driver 



This change fixes the name of the icp driver directory,
dead lock issues and redundant prints.

Change-Id: Ifa047d4b04580ad883628ce6b6aabe62524dde99
Signed-off-by: default avatarSuresh Vankadara <svankada@codeaurora.org>
Signed-off-by: default avatarLakshmi Narayana Kalavala <lkalaval@codeaurora.org>
parent 5499a5f1

drivers/media/platform/msm/camera/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ obj-$(CONFIG_SPECTRA_CAMERA) += cam_cpas/ 
obj-$(CONFIG_SPECTRA_CAMERA) += cam_cdm/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_isp/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_sensor_module/

obj-$(CONFIG_SPECTRA_CAMERA) += icp/
 
obj-$(CONFIG_SPECTRA_CAMERA) += cam_icp/

drivers/media/platform/msm/camera/cam_core/cam_core_defs.h

+4 −3
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */

#ifndef _CAM_REQ_MGR_CORE_DEFS_H_

#define _CAM_REQ_MGR_CORE_DEFS_H_



#ifndef _CAM_CORE_DEFS_H_

#define _CAM_CORE_DEFS_H_



#define CAM_CORE_TRACE_ENABLE 0
@@ -40,5 +41,5 @@ 
	__func__, __LINE__, ##args)

#endif



#endif /* _CAM_REQ_MGR_CORE_DEFS_H_ */

#endif /* _CAM_CORE_DEFS_H_ */

drivers/media/platform/msm/camera/cam_core/cam_subdev.c

+4 −8
Original line number Diff line number Diff line
@@ -129,16 +129,12 @@ int cam_subdev_probe(struct cam_subdev *sd, struct platform_device *pdev, 
	int rc;

	struct cam_node *node = NULL;



	if (!sd || !pdev || !name) {

		rc = -EINVAL;

		goto err;

	}

	if (!sd || !pdev || !name)

		return -EINVAL;



	node = kzalloc(sizeof(*node), GFP_KERNEL);

	if (!node) {

		rc = -ENOMEM;

		goto err;

	}

	if (!node)

		return -ENOMEM;



	/* Setup camera v4l2 subdevice */

	sd->pdev = pdev;

drivers/media/platform/msm/camera/icp/Makefile→drivers/media/platform/msm/camera/cam_icp/Makefile

+4 −5
Original line number Diff line number Diff line
@@ -2,13 +2,12 @@ ccflags-y += -Idrivers/media/platform/msm/camera/cam_utils 
ccflags-y += -Idrivers/media/platform/msm/camera/cam_req_mgr

ccflags-y += -Idrivers/media/platform/msm/camera/cam_core

ccflags-y += -Idrivers/media/platform/msm/camera/cam_sync

ccflags-y += -Idrivers/media/platform/msm/camera/icp

ccflags-y += -Idrivers/media/platform/msm/camera/icp/icp_hw/include

ccflags-y += -Idrivers/media/platform/msm/camera/icp/icp_hw/icp_hw_mgr

ccflags-y += -Idrivers/media/platform/msm/camera/icp/fw_inc

ccflags-y += -Idrivers/media/platform/msm/camera/cam_icp

ccflags-y += -Idrivers/media/platform/msm/camera/cam_icp/icp_hw/include

ccflags-y += -Idrivers/media/platform/msm/camera/cam_icp/icp_hw/icp_hw_mgr

ccflags-y += -Idrivers/media/platform/msm/camera/cam_icp/fw_inc

ccflags-y += -Idrivers/media/platform/msm/camera

ccflags-y += -Idrivers/media/platform/msm/camera/cam_cpas/include





obj-$(CONFIG_SPECTRA_CAMERA) += icp_hw/

obj-$(CONFIG_SPECTRA_CAMERA) += cam_icp_subdev.o cam_icp_context.o hfi.o