summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-07-17 14:16:08 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2013-07-31 02:04:23 +0200
commit4dd0b2ba1d8c96d18c4a5624b167e267671d047f (patch)
tree93693e9ee387b69618abd1cb78586629307a636a
parentmfd: wm8997: Make Kconfig prompt for WM8997 more consistent (diff)
downloadlinux-4dd0b2ba1d8c96d18c4a5624b167e267671d047f.tar.xz
linux-4dd0b2ba1d8c96d18c4a5624b167e267671d047f.zip
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)
break;
}
- switch (wm8994->type) {
- case WM1811:
- ret = wm8994_reg_read(wm8994, WM8994_ANTIPOP_2);
- if (ret < 0) {
- dev_err(dev, "Failed to read jackdet: %d\n", ret);
- } else if (ret & WM1811_JACKDET_MODE_MASK) {
- dev_dbg(dev, "CODEC still active, ignoring suspend\n");
- return 0;
- }
- break;
- default:
- break;
- }
-
/* Disable LDO pulldowns while the device is suspended if we
* don't know that something will be driving them. */
if (!wm8994->ldo_ena_always_driven)