aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/max77693.c
diff options
context:
space:
mode:
authorAndrzej Hajda <a.hajda@samsung.com>2013-08-21 12:53:33 -0400
committerLee Jones <lee.jones@linaro.org>2013-10-23 11:21:26 -0400
commit4233a0aafb72985a4692a9e6af5c528811226ac1 (patch)
tree7ac437f01964c33fdd18be7860f81e666bec4de4 /drivers/mfd/max77693.c
parent0248b4bfe56f0545c051e6230939ca8b95f1b037 (diff)
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/max77693.c')
-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,
110 const struct i2c_device_id *id) 110 const struct i2c_device_id *id)
111{ 111{
112 struct max77693_dev *max77693; 112 struct max77693_dev *max77693;
113 struct max77693_platform_data *pdata = dev_get_platdata(&i2c->dev);
114 u8 reg_data; 113 u8 reg_data;
115 int ret = 0; 114 int ret = 0;
116 115
117 if (!pdata) {
118 dev_err(&i2c->dev, "No platform data found.\n");
119 return -EINVAL;
120 }
121
122 max77693 = devm_kzalloc(&i2c->dev, 116 max77693 = devm_kzalloc(&i2c->dev,
123 sizeof(struct max77693_dev), GFP_KERNEL); 117 sizeof(struct max77693_dev), GFP_KERNEL);
124 if (max77693 == NULL) 118 if (max77693 == NULL)
@@ -138,8 +132,6 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
138 return ret; 132 return ret;
139 } 133 }
140 134
141 max77693->wakeup = pdata->wakeup;
142
143 ret = max77693_read_reg(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2, 135 ret = max77693_read_reg(max77693->regmap, MAX77693_PMIC_REG_PMIC_ID2,
144 &reg_data); 136 &reg_data);
145 if (ret < 0) { 137 if (ret < 0) {
@@ -179,8 +171,6 @@ static int max77693_i2c_probe(struct i2c_client *i2c,
179 if (ret < 0) 171 if (ret < 0)
180 goto err_mfd; 172 goto err_mfd;
181 173
182 device_init_wakeup(max77693->dev, pdata->wakeup);
183
184 return ret; 174 return ret;
185 175
186err_mfd: 176err_mfd: