summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorAndrzej Hajda <a.hajda@samsung.com>2013-08-21 18:53:33 +0200
committerLee Jones <lee.jones@linaro.org>2013-10-23 17:21:26 +0200
commit4233a0aafb72985a4692a9e6af5c528811226ac1 (patch)
tree7ac437f01964c33fdd18be7860f81e666bec4de4 /drivers/mfd
parentmfd: mc13xxx: Move SPI erratum workaround into SPI I/O function (diff)
downloadlinux-4233a0aafb72985a4692a9e6af5c528811226ac1.tar.xz
linux-4233a0aafb72985a4692a9e6af5c528811226ac1.zip
mfd: max77693: Remove device wakeup from driver
The patch removes wakeup related code from the driver and plaftorm data - it is already handled by i2c core using I2C_CLIENT_WAKE flag from struct i2c_board_info. As a result MFD itself do not requires platform data. Signed-off-by: Andrzej Hajda <a.hajda@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/max77693.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/mfd/max77693.c b/drivers/mfd/max77693.c
index c04723efc707..27f5da3bc63a 100644
--- a/drivers/mfd/max77693.c
+++ b/drivers/mfd/max77693.c
@@ -110,15 +110,9 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct max77693_dev *max77693;
- struct max77693_platform_data *pdata = dev_get_platdata(&i2c->dev);
u8 reg_data;
int ret = 0;
- if (!pdata) {
- dev_err(&i2c->dev, "No platform data found.\n");
- return -EINVAL;
- }
-
max77693 = devm_kzalloc(&i2c->dev,
sizeof(struct max77693_dev), GFP_KERNEL);
if (max77693 == NULL)
@@ -138,8 +132,6 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
return ret;
}
- max77693->wakeup = pdata->wakeup;
-
ret = max77693_read_reg(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2,
&reg_data);
if (ret < 0) {
@@ -179,8 +171,6 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
if (ret < 0)
goto err_mfd;
- device_init_wakeup(max77693->dev, pdata->wakeup);
-
return ret;
err_mfd: