diff options
-rw-r--r-- | drivers/mfd/max77693.c | 10 | ||||
-rw-r--r-- | include/linux/mfd/max77693-private.h | 1 | ||||
-rw-r--r-- | include/linux/mfd/max77693.h | 2 |
3 files changed, 0 insertions, 13 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 | ®_data); | 136 | ®_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 | ||
186 | err_mfd: | 176 | err_mfd: |
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h index 244fb0d51589..3e050b933dd0 100644 --- a/include/linux/mfd/max77693-private.h +++ b/include/linux/mfd/max77693-private.h | |||
@@ -323,7 +323,6 @@ struct max77693_dev { | |||
323 | 323 | ||
324 | int irq; | 324 | int irq; |
325 | int irq_gpio; | 325 | int irq_gpio; |
326 | bool wakeup; | ||
327 | struct mutex irqlock; | 326 | struct mutex irqlock; |
328 | int irq_masks_cur[MAX77693_IRQ_GROUP_NR]; | 327 | int irq_masks_cur[MAX77693_IRQ_GROUP_NR]; |
329 | int irq_masks_cache[MAX77693_IRQ_GROUP_NR]; | 328 | int irq_masks_cache[MAX77693_IRQ_GROUP_NR]; |
diff --git a/include/linux/mfd/max77693.h b/include/linux/mfd/max77693.h index 676f0f388992..3f3dc45f93ee 100644 --- a/include/linux/mfd/max77693.h +++ b/include/linux/mfd/max77693.h | |||
@@ -64,8 +64,6 @@ struct max77693_muic_platform_data { | |||
64 | }; | 64 | }; |
65 | 65 | ||
66 | struct max77693_platform_data { | 66 | struct max77693_platform_data { |
67 | int wakeup; | ||
68 | |||
69 | /* regulator data */ | 67 | /* regulator data */ |
70 | struct max77693_regulator_data *regulators; | 68 | struct max77693_regulator_data *regulators; |
71 | int num_regulators; | 69 | int num_regulators; |