summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRussell King2012-01-21 10:33:38 +0100
committerRussell King2012-02-19 00:15:32 +0100
commitcae154767a96563d33924872aacfdc63d584f707 (patch)
tree5071f9b5c462bb48b8f6539aeb62664a3e7ab20a /include
parentMFD: ucb1x00-core: add .owner initializer and module alias (diff)
downloadkernel-qcow2-linux-cae154767a96563d33924872aacfdc63d584f707.tar.gz
kernel-qcow2-linux-cae154767a96563d33924872aacfdc63d584f707.tar.xz
kernel-qcow2-linux-cae154767a96563d33924872aacfdc63d584f707.zip
MFD: ucb1x00-core: use mutexes instead of semaphores
Convert the ucb1x00 driver to use mutexes rather than the depreciated semaphores for exclusive access to the ADC. Acked-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/ucb1x00.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h
index fd088cc6a4ca..a4b954381c2f 100644
--- a/include/linux/mfd/ucb1x00.h
+++ b/include/linux/mfd/ucb1x00.h
@@ -12,7 +12,7 @@
#include <linux/mfd/mcp.h>
#include <linux/gpio.h>
-#include <linux/semaphore.h>
+#include <linux/mutex.h>
#define UCB_IO_DATA 0x00
#define UCB_IO_DIR 0x01
@@ -124,7 +124,7 @@ struct ucb1x00 {
spinlock_t lock;
struct mcp *mcp;
unsigned int irq;
- struct semaphore adc_sem;
+ struct mutex adc_mutex;
spinlock_t io_lock;
u16 id;
u16 io_dir;