aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-21 04:33:38 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-18 18:15:32 -0500
commitcae154767a96563d33924872aacfdc63d584f707 (patch)
tree5071f9b5c462bb48b8f6539aeb62664a3e7ab20a /include/linux/mfd
parentddb1e04a35846b6c5b6039e92555dafaf6ee03d2 (diff)
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/linux/mfd')
-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 @@
12 12
13#include <linux/mfd/mcp.h> 13#include <linux/mfd/mcp.h>
14#include <linux/gpio.h> 14#include <linux/gpio.h>
15#include <linux/semaphore.h> 15#include <linux/mutex.h>
16 16
17#define UCB_IO_DATA 0x00 17#define UCB_IO_DATA 0x00
18#define UCB_IO_DIR 0x01 18#define UCB_IO_DIR 0x01
@@ -124,7 +124,7 @@ struct ucb1x00 {
124 spinlock_t lock; 124 spinlock_t lock;
125 struct mcp *mcp; 125 struct mcp *mcp;
126 unsigned int irq; 126 unsigned int irq;
127 struct semaphore adc_sem; 127 struct mutex adc_mutex;
128 spinlock_t io_lock; 128 spinlock_t io_lock;
129 u16 id; 129 u16 id;
130 u16 io_dir; 130 u16 io_dir;