diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-07-06 03:32:20 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-07-08 18:16:14 -0400 |
commit | b8748096111b483de8a544cc220510dff17bbff9 (patch) | |
tree | af190720dc710adc899bd3804891fd462363ff2c | |
parent | 2573f6d36e73e080fc1d9d9ac7dfaf2253a61434 (diff) |
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.c | 3 | ||||
-rw-r--r-- | include/linux/mfd/max77686-private.h | 1 |
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 @@ | |||
27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
28 | #include <linux/pm_runtime.h> | 28 | #include <linux/pm_runtime.h> |
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/mutex.h> | ||
31 | #include <linux/mfd/core.h> | 30 | #include <linux/mfd/core.h> |
32 | #include <linux/mfd/max77686.h> | 31 | #include <linux/mfd/max77686.h> |
33 | #include <linux/mfd/max77686-private.h> | 32 | #include <linux/mfd/max77686-private.h> |
@@ -79,8 +78,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c, | |||
79 | max77686->wakeup = pdata->wakeup; | 78 | max77686->wakeup = pdata->wakeup; |
80 | max77686->irq_gpio = pdata->irq_gpio; | 79 | max77686->irq_gpio = pdata->irq_gpio; |
81 | 80 | ||
82 | mutex_init(&max77686->iolock); | ||
83 | |||
84 | if (regmap_read(max77686->regmap, | 81 | if (regmap_read(max77686->regmap, |
85 | MAX77686_REG_DEVICE_ID, &data) < 0) { | 82 | MAX77686_REG_DEVICE_ID, &data) < 0) { |
86 | dev_err(max77686->dev, | 83 | 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 { | |||
219 | struct device *dev; | 219 | struct device *dev; |
220 | struct i2c_client *i2c; /* 0xcc / PMIC, Battery Control, and FLASH */ | 220 | struct i2c_client *i2c; /* 0xcc / PMIC, Battery Control, and FLASH */ |
221 | struct i2c_client *rtc; /* slave addr 0x0c */ | 221 | struct i2c_client *rtc; /* slave addr 0x0c */ |
222 | struct mutex iolock; | ||
223 | 222 | ||
224 | int type; | 223 | int type; |
225 | 224 | ||