summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-07-06 09:32:20 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-09 00:16:14 +0200
commitb8748096111b483de8a544cc220510dff17bbff9 (patch)
treeaf190720dc710adc899bd3804891fd462363ff2c
parentmfd: Add pre-regulator device for 88pm860x (diff)
downloadlinux-b8748096111b483de8a544cc220510dff17bbff9.tar.xz
linux-b8748096111b483de8a544cc220510dff17bbff9.zip
mfd: Remove unused max77686 iolock mutex
Now this driver is using regmap API, the iolock mutex is not used and can be removed. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/max77686.c3
-rw-r--r--include/linux/mfd/max77686-private.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index 11e56017e0b0..9e7e1d30f25f 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -27,7 +27,6 @@
#include <linux/i2c.h>
#include <linux/pm_runtime.h>
#include <linux/module.h>
-#include <linux/mutex.h>
#include <linux/mfd/core.h>
#include <linux/mfd/max77686.h>
#include <linux/mfd/max77686-private.h>
@@ -79,8 +78,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
max77686->wakeup = pdata->wakeup;
max77686->irq_gpio = pdata->irq_gpio;
- mutex_init(&max77686->iolock);
-
if (regmap_read(max77686->regmap,
MAX77686_REG_DEVICE_ID, &data) < 0) {
dev_err(max77686->dev,
diff --git a/include/linux/mfd/max77686-private.h b/include/linux/mfd/max77686-private.h
index 962f65e72b71..d327d4971e4f 100644
--- a/include/linux/mfd/max77686-private.h
+++ b/include/linux/mfd/max77686-private.h
@@ -219,7 +219,6 @@ struct max77686_dev {
struct device *dev;
struct i2c_client *i2c; /* 0xcc / PMIC, Battery Control, and FLASH */
struct i2c_client *rtc; /* slave addr 0x0c */
- struct mutex iolock;
int type;