Merge "msm: camera: common: Use the appropriate header for spinlock" into camera-kernel.lnx.5.0

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 <linux/mutex.h>
-#include <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 #include <linux/kref.h>
 #include "cam_req_mgr_interface.h"
 #include "cam_hw_mgr_intf.h"

drivers/cam_cust/cam_custom_context.h

@@ -6,7 +6,7 @@
 #ifndef _CAM_CUSTOM_CONTEXT_H_
 #define _CAM_CUSTOM_CONTEXT_H_
 
-#include <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 
 #include <media/cam_custom.h>
 #include <media/cam_defs.h>

drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

@@ -10,7 +10,7 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
-#include <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 #include <linux/workqueue.h>
 #include <linux/timer.h>
 #include <linux/bitops.h>

drivers/cam_isp/cam_isp_context.h

@@ -7,7 +7,7 @@
 #define _CAM_ISP_CONTEXT_H_
 
 
-#include <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 #include <media/cam_isp.h>
 #include <media/cam_defs.h>
 #include <media/cam_tfe.h>

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 <linux/slab.h>
-#include <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 #include <linux/interrupt.h>
 #include <linux/list.h>
 #include <linux/ratelimit.h>

drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c

@@ -4,7 +4,7 @@
  */
 
 #include <linux/slab.h>
-#include <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 #include <linux/list.h>
 #include <linux/ratelimit.h>
 

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 <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 #include "cam_hw_intf.h"
 #include "cam_sfe_hw_intf.h"
 #include "cam_sfe_bus.h"

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 <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 #include "cam_hw_intf.h"
 #include "cam_tfe_bus.h"
 #include "cam_tfe_hw_intf.h"

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 <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 #include "cam_hw_intf.h"
 #include "cam_vfe_top.h"
 #include "cam_vfe_bus.h"

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 <linux/uaccess.h>
@@ -9,7 +9,7 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
-#include <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 #include <linux/timer.h>
 #include <linux/debugfs.h>
 #include <media/cam_defs.h>

drivers/cam_ope/ope_hw_mgr/cam_ope_hw_mgr.c

@@ -10,7 +10,7 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
-#include <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 #include <linux/workqueue.h>
 #include <linux/timer.h>
 #include <linux/bitops.h>

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 <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 #include "cam_req_mgr_interface.h"
 #include "cam_req_mgr_core_defs.h"
 #include "cam_req_mgr_timer.h"

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 <linux/of_platform.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
-#include <linux/spinlock.h>
+#include <linux/spinlock_types.h>
 #include <linux/random.h>
 #include <media/cam_req_mgr.h>
 #include "cam_req_mgr_util.h"