From 5925b1badc672f7f06e8e404ead5c3698d585ae5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Wed, 20 Aug 2014 00:12:22 +0200
Subject: [PATCH] pc_serial: Remove read and write lock

As with hrev42089 for usb_serial.
---
 .../drivers/ports/pc_serial/SerialDevice.cpp  | 24 -------------------
 .../drivers/ports/pc_serial/SerialDevice.h    |  4 ----
 2 files changed, 28 deletions(-)

diff --git a/src/add-ons/kernel/drivers/ports/pc_serial/SerialDevice.cpp b/src/add-ons/kernel/drivers/ports/pc_serial/SerialDevice.cpp
index e3113432c7..e5a4d072e5 100644
--- a/src/add-ons/kernel/drivers/ports/pc_serial/SerialDevice.cpp
+++ b/src/add-ons/kernel/drivers/ports/pc_serial/SerialDevice.cpp
@@ -59,9 +59,6 @@ SerialDevice::~SerialDevice()
 
 	if (fBufferArea >= B_OK)
 		delete_area(fBufferArea);
-
-	mutex_destroy(&fReadLock);
-	mutex_destroy(&fWriteLock);
 }
 
 
@@ -70,8 +67,6 @@ SerialDevice::Init()
 {
 	fDoneRead = create_sem(0, "usb_serial:done_read");
 	fDoneWrite = create_sem(0, "usb_serial:done_write");
-	mutex_init(&fReadLock, "usb_serial:read_lock");
-	mutex_init(&fWriteLock, "usb_serial:write_lock");
 
 	size_t totalBuffers = fReadBufferSize + fWriteBufferSize + fInterruptBufferSize;
 	fBufferArea = create_area("usb_serial:buffers_area", (void **)&fReadBuffer,
@@ -493,17 +488,8 @@ SerialDevice::Read(char *buffer, size_t *numBytes)
 
 	status_t status;
 
-	status = mutex_lock(&fReadLock);
-	if (status != B_OK) {
-		TRACE_ALWAYS("read: failed to get read lock\n");
-		*numBytes = 0;
-		return status;
-	}
-
 	status = gTTYModule->tty_read(fSystemTTYCookie, buffer, numBytes);
 
-	mutex_unlock(&fReadLock);
-
 	return status;
 }
 
@@ -516,15 +502,8 @@ SerialDevice::Write(const char *buffer, size_t *numBytes)
 
 	status_t status = EINVAL;
 
-	status = mutex_lock(&fWriteLock);
-	if (status != B_OK) {
-		TRACE_ALWAYS("write: failed to get write lock\n");
-		return status;
-	}
-
 	//XXX: WTF tty_write() is not for write() hook ?
 	//status = gTTYModule->tty_write(fSystemTTYCookie, buffer, numBytes);
-	mutex_unlock(&fWriteLock);
 
 #if 0
 	status_t status = mutex_lock(&fWriteLock);
@@ -669,9 +648,6 @@ SerialDevice::Removed()
 	//int32 result = B_OK;
 	//wait_for_thread(fDeviceThread, &result);
 	fDeviceThread = -1;
-
-	mutex_lock(&fWriteLock);
-	mutex_unlock(&fWriteLock);
 }
 
 
diff --git a/src/add-ons/kernel/drivers/ports/pc_serial/SerialDevice.h b/src/add-ons/kernel/drivers/ports/pc_serial/SerialDevice.h
index fe910d685a..0605d106a5 100644
--- a/src/add-ons/kernel/drivers/ports/pc_serial/SerialDevice.h
+++ b/src/add-ons/kernel/drivers/ports/pc_serial/SerialDevice.h
@@ -149,10 +149,6 @@ static	void					InterruptCallbackFunction(void *cookie,
 		/* device thread management */
 		thread_id				fDeviceThread;
 		bool					fStopDeviceThread;
-
-		/* device locks to ensure no concurent reads/writes */
-		mutex					fReadLock;
-		mutex					fWriteLock;
 };
 
 #endif // _SERIAL_DEVICE_H_