aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/tps65217.c
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2016-04-07 14:43:12 -0400
committerLee Jones <lee.jones@linaro.org>2016-04-19 02:56:49 -0400
commitb89b6b6bcd570a0beb1fc6fb8d0ecc20316413ab (patch)
tree6f26a5505fe7e1c0ffee9b2602ce1e3ddfb2c1aa /drivers/mfd/tps65217.c
parent5635d994fe870a0de2614e83bbf2d70f506651eb (diff)
mfd: tps65217: Use devm_mfd_add_devices() for mfd_device registration
Use devm_mfd_add_devices() for MFD devices registration and get rid of .remove callback to remove MFD child-devices. This is done by managed device framework. CC: Tony Lindgren <tony@atomide.com> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/tps65217.c')
-rw-r--r--drivers/mfd/tps65217.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c
index d32b54426b70..049a6fcac651 100644
--- a/drivers/mfd/tps65217.c
+++ b/drivers/mfd/tps65217.c
@@ -205,8 +205,8 @@ static int tps65217_probe(struct i2c_client *client,
205 return ret; 205 return ret;
206 } 206 }
207 207
208 ret = mfd_add_devices(tps->dev, -1, tps65217s, 208 ret = devm_mfd_add_devices(tps->dev, -1, tps65217s,
209 ARRAY_SIZE(tps65217s), NULL, 0, NULL); 209 ARRAY_SIZE(tps65217s), NULL, 0, NULL);
210 if (ret < 0) { 210 if (ret < 0) {
211 dev_err(tps->dev, "mfd_add_devices failed: %d\n", ret); 211 dev_err(tps->dev, "mfd_add_devices failed: %d\n", ret);
212 return ret; 212 return ret;
@@ -235,15 +235,6 @@ static int tps65217_probe(struct i2c_client *client,
235 return 0; 235 return 0;
236} 236}
237 237
238static int tps65217_remove(struct i2c_client *client)
239{
240 struct tps65217 *tps = i2c_get_clientdata(client);
241
242 mfd_remove_devices(tps->dev);
243
244 return 0;
245}
246
247static const struct i2c_device_id tps65217_id_table[] = { 238static const struct i2c_device_id tps65217_id_table[] = {
248 {"tps65217", TPS65217}, 239 {"tps65217", TPS65217},
249 { /* sentinel */ } 240 { /* sentinel */ }
@@ -257,7 +248,6 @@ static struct i2c_driver tps65217_driver = {
257 }, 248 },
258 .id_table = tps65217_id_table, 249 .id_table = tps65217_id_table,
259 .probe = tps65217_probe, 250 .probe = tps65217_probe,
260 .remove = tps65217_remove,
261}; 251};
262 252
263static int __init tps65217_init(void) 253static int __init tps65217_init(void)