From 9f4f8e114cbbf41bf6d0063594a1313fce0c0b97 Mon Sep 17 00:00:00 2001 From: Karthik Anantha Ram Date: Tue, 9 Mar 2021 11:40:57 -0800 Subject: [PATCH] msm: camera: common: Use the appropriate header for spinlock With the allow list tightened, use the right header for spinlock usage. Change replaces usage of linux/spinlock.h to linux/spinlock_types.h. CRs-Fixed: 2841729 Change-Id: I0247501b765436099f75c9725e9f614f0873c888 Signed-off-by: Karthik Anantha Ram --- drivers/cam_core/cam_context.h | 4 ++-- drivers/cam_cust/cam_custom_context.h | 2 +- drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c | 2 +- drivers/cam_isp/cam_isp_context.h | 2 +- drivers/cam_isp/isp_hw_mgr/hw_utils/cam_tasklet_util.c | 4 ++-- .../isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c | 2 +- drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_core.h | 4 ++-- drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.h | 2 +- drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_core.h | 2 +- drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c | 4 ++-- drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c | 4 ++-- drivers/cam_req_mgr/cam_req_mgr_core.h | 2 +- drivers/cam_req_mgr/cam_req_mgr_util.c | 4 ++-- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/cam_core/cam_context.h b/drivers/cam_core/cam_context.h index 91323c78d9..1a3c66b821 100644 --- a/drivers/cam_core/cam_context.h +++ b/drivers/cam_core/cam_context.h @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved. */ #ifndef _CAM_CONTEXT_H_ #define _CAM_CONTEXT_H_ #include -#include +#include #include #include "cam_req_mgr_interface.h" #include "cam_hw_mgr_intf.h" diff --git a/drivers/cam_cust/cam_custom_context.h b/drivers/cam_cust/cam_custom_context.h index ef7fe1f874..f8eae6a2cf 100644 --- a/drivers/cam_cust/cam_custom_context.h +++ b/drivers/cam_cust/cam_custom_context.h @@ -6,7 +6,7 @@ #ifndef _CAM_CUSTOM_CONTEXT_H_ #define _CAM_CUSTOM_CONTEXT_H_ -#include +#include #include #include diff --git a/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c b/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c index 7426f10853..b64e89deea 100644 --- a/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c +++ b/drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/cam_isp/cam_isp_context.h b/drivers/cam_isp/cam_isp_context.h index fbabb598e0..3a1371a07b 100644 --- a/drivers/cam_isp/cam_isp_context.h +++ b/drivers/cam_isp/cam_isp_context.h @@ -7,7 +7,7 @@ #define _CAM_ISP_CONTEXT_H_ -#include +#include #include #include #include diff --git a/drivers/cam_isp/isp_hw_mgr/hw_utils/cam_tasklet_util.c b/drivers/cam_isp/isp_hw_mgr/hw_utils/cam_tasklet_util.c index 356c9a0a89..e7cae5aa5f 100644 --- a/drivers/cam_isp/isp_hw_mgr/hw_utils/cam_tasklet_util.c +++ b/drivers/cam_isp/isp_hw_mgr/hw_utils/cam_tasklet_util.c @@ -1,10 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved. */ #include -#include +#include #include #include #include diff --git a/drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c b/drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c index 75e05afae6..ec162f20ec 100644 --- a/drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c +++ b/drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c @@ -4,7 +4,7 @@ */ #include -#include +#include #include #include diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_core.h b/drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_core.h index 9fd621893a..13f0633e2a 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_core.h +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_core.h @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ #ifndef _CAM_SFE_CORE_H_ #define _CAM_SFE_CORE_H_ -#include +#include #include "cam_hw_intf.h" #include "cam_sfe_hw_intf.h" #include "cam_sfe_bus.h" diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.h b/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.h index f855160d18..3eadd8aea1 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.h +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.h @@ -7,7 +7,7 @@ #ifndef _CAM_TFE_CORE_H_ #define _CAM_TFE_CORE_H_ -#include +#include #include "cam_hw_intf.h" #include "cam_tfe_bus.h" #include "cam_tfe_hw_intf.h" diff --git a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_core.h b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_core.h index ae9dc5a1c5..f5862b8194 100644 --- a/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_core.h +++ b/drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_core.h @@ -6,7 +6,7 @@ #ifndef _CAM_VFE_CORE_H_ #define _CAM_VFE_CORE_H_ -#include +#include #include "cam_hw_intf.h" #include "cam_vfe_top.h" #include "cam_vfe_bus.h" diff --git a/drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c b/drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c index da45d2f49d..c676d84d2b 100644 --- a/drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c +++ b/drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved. */ #include @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c b/drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c index b468b2b55e..2a84b81e96 100644 --- a/drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c +++ b/drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved. */ #include @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/cam_req_mgr/cam_req_mgr_core.h b/drivers/cam_req_mgr/cam_req_mgr_core.h index f98a2a74bc..a7daa4b5cf 100644 --- a/drivers/cam_req_mgr/cam_req_mgr_core.h +++ b/drivers/cam_req_mgr/cam_req_mgr_core.h @@ -5,7 +5,7 @@ #ifndef _CAM_REQ_MGR_CORE_H_ #define _CAM_REQ_MGR_CORE_H_ -#include +#include #include "cam_req_mgr_interface.h" #include "cam_req_mgr_core_defs.h" #include "cam_req_mgr_timer.h" diff --git a/drivers/cam_req_mgr/cam_req_mgr_util.c b/drivers/cam_req_mgr/cam_req_mgr_util.c index 4b1f4d8e86..a627a1fb41 100644 --- a/drivers/cam_req_mgr/cam_req_mgr_util.c +++ b/drivers/cam_req_mgr/cam_req_mgr_util.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved. */ #define pr_fmt(fmt) "CAM-REQ-MGR_UTIL %s:%d " fmt, __func__, __LINE__ @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include "cam_req_mgr_util.h"