aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-17 08:16:08 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-07-30 20:04:23 -0400
commit4dd0b2ba1d8c96d18c4a5624b167e267671d047f (patch)
tree93693e9ee387b69618abd1cb78586629307a636a
parentca16ecbccb718c8ba3a5d896f160831a10f8cdfb (diff)
mfd: wm8994: Remove unneeded check for JACKDET
The jack detection code holds runtime PM references when required so there is no need for suspend to do any checks. Signed-off-by: Mark Brown <broonie@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/wm8994-core.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 781115e8dca9..e8ecb8e218d7 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -245,20 +245,6 @@ static int wm8994_suspend(struct device *dev)
245 break; 245 break;
246 } 246 }
247 247
248 switch (wm8994->type) {
249 case WM1811:
250 ret = wm8994_reg_read(wm8994, WM8994_ANTIPOP_2);
251 if (ret < 0) {
252 dev_err(dev, "Failed to read jackdet: %d\n", ret);
253 } else if (ret & WM1811_JACKDET_MODE_MASK) {
254 dev_dbg(dev, "CODEC still active, ignoring suspend\n");
255 return 0;
256 }
257 break;
258 default:
259 break;
260 }
261
262 /* Disable LDO pulldowns while the device is suspended if we 248 /* Disable LDO pulldowns while the device is suspended if we
263 * don't know that something will be driving them. */ 249 * don't know that something will be driving them. */
264 if (!wm8994->ldo_ena_always_driven) 250 if (!wm8994->ldo_ena_always_driven)