From 7b86854e4014b10844848f9619c648e6ccfbf9c6 Mon Sep 17 00:00:00 2001
From: Hirokazu Honda <hiroh@chromium.org>
Date: Wed, 1 Dec 2021 16:53:39 +0900
Subject: v4l2: Consolidate mutex classes to Mutex and MutexLocker

std::mutex and std::unique_lock are used in v4l2 directory,
mixing Mutex and MutexLocker. This consolidates them to Mutex
and MutexLocker.

This also fixes vidioc_dqbuf argument to take Mutex instead of
MutexLocker.

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/v4l2/v4l2_camera.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/v4l2/v4l2_camera.h')

diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h
index 4afbb331..bf1b6de4 100644
--- a/src/v4l2/v4l2_camera.h
+++ b/src/v4l2/v4l2_camera.h
@@ -8,10 +8,10 @@
 #pragma once
 
 #include <deque>
-#include <mutex>
 #include <utility>
 
 #include <libcamera/base/semaphore.h>
+#include <libcamera/base/thread.h>
 
 #include <libcamera/camera.h>
 #include <libcamera/file_descriptor.h>
@@ -71,7 +71,7 @@ private:
 
 	bool isRunning_;
 
-	std::mutex bufferLock_;
+	libcamera::Mutex bufferLock_;
 	libcamera::FrameBufferAllocator *bufferAllocator_;
 
 	std::vector<std::unique_ptr<libcamera::Request>> requestPool_;
-- 
cgit v1.2.1