diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-23 14:14:31 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2013-09-25 08:47:27 -0400 |
commit | c29c2d4e6ba4f8f5868a4c6dd75a4c23e1993721 (patch) | |
tree | 6ab89e154ce9ae643519382dd15a4a92128c4a02 | |
parent | 272b98c6455f00884f0350f775c5342358ebb73f (diff) |
mfd: mc13xxx: Don't require lock for simple register I/O
Since the conversion to regmap there has been no need for device level
locking for I/O as regmap provides locking so remove the locks.
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | drivers/mfd/mc13xxx-core.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c index 2a9b100c4825..dbbf8ee3f592 100644 --- a/drivers/mfd/mc13xxx-core.c +++ b/drivers/mfd/mc13xxx-core.c | |||
@@ -158,8 +158,6 @@ int mc13xxx_reg_read(struct mc13xxx *mc13xxx, unsigned int offset, u32 *val) | |||
158 | { | 158 | { |
159 | int ret; | 159 | int ret; |
160 | 160 | ||
161 | BUG_ON(!mutex_is_locked(&mc13xxx->lock)); | ||
162 | |||
163 | if (offset > MC13XXX_NUMREGS) | 161 | if (offset > MC13XXX_NUMREGS) |
164 | return -EINVAL; | 162 | return -EINVAL; |
165 | 163 | ||
@@ -172,8 +170,6 @@ EXPORT_SYMBOL(mc13xxx_reg_read); | |||
172 | 170 | ||
173 | int mc13xxx_reg_write(struct mc13xxx *mc13xxx, unsigned int offset, u32 val) | 171 | int mc13xxx_reg_write(struct mc13xxx *mc13xxx, unsigned int offset, u32 val) |
174 | { | 172 | { |
175 | BUG_ON(!mutex_is_locked(&mc13xxx->lock)); | ||
176 | |||
177 | dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x\n", offset, val); | 173 | dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x\n", offset, val); |
178 | 174 | ||
179 | if (offset > MC13XXX_NUMREGS || val > 0xffffff) | 175 | if (offset > MC13XXX_NUMREGS || val > 0xffffff) |
@@ -186,7 +182,6 @@ EXPORT_SYMBOL(mc13xxx_reg_write); | |||
186 | int mc13xxx_reg_rmw(struct mc13xxx *mc13xxx, unsigned int offset, | 182 | int mc13xxx_reg_rmw(struct mc13xxx *mc13xxx, unsigned int offset, |
187 | u32 mask, u32 val) | 183 | u32 mask, u32 val) |
188 | { | 184 | { |
189 | BUG_ON(!mutex_is_locked(&mc13xxx->lock)); | ||
190 | BUG_ON(val & ~mask); | 185 | BUG_ON(val & ~mask); |
191 | dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x (mask: 0x%06x)\n", | 186 | dev_vdbg(mc13xxx->dev, "[0x%02x] <- 0x%06x (mask: 0x%06x)\n", |
192 | offset, val, mask); | 187 | offset, val, mask); |