diff options
author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-04-07 14:43:09 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2016-04-19 02:56:28 -0400 |
commit | 69633beaebf345cde6672a9ac7679c88fc0c3245 (patch) | |
tree | 2b8dae7f52c8404cc84208ff66c130ce1b8c92af /drivers/mfd/sky81452.c | |
parent | 6b719eba9f01cd65ede04e64f20f648f8dbe6359 (diff) |
mfd: sky81452: 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: Gyungoh Yoo <jack.yoo@skyworksinc.com>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/sky81452.c')
-rw-r--r-- | drivers/mfd/sky81452.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/mfd/sky81452.c b/drivers/mfd/sky81452.c index b0c9b0415650..30a2a677100f 100644 --- a/drivers/mfd/sky81452.c +++ b/drivers/mfd/sky81452.c | |||
@@ -64,19 +64,14 @@ static int sky81452_probe(struct i2c_client *client, | |||
64 | cells[1].platform_data = pdata->regulator_init_data; | 64 | cells[1].platform_data = pdata->regulator_init_data; |
65 | cells[1].pdata_size = sizeof(*pdata->regulator_init_data); | 65 | cells[1].pdata_size = sizeof(*pdata->regulator_init_data); |
66 | 66 | ||
67 | ret = mfd_add_devices(dev, -1, cells, ARRAY_SIZE(cells), NULL, 0, NULL); | 67 | ret = devm_mfd_add_devices(dev, -1, cells, ARRAY_SIZE(cells), |
68 | NULL, 0, NULL); | ||
68 | if (ret) | 69 | if (ret) |
69 | dev_err(dev, "failed to add child devices. err=%d\n", ret); | 70 | dev_err(dev, "failed to add child devices. err=%d\n", ret); |
70 | 71 | ||
71 | return ret; | 72 | return ret; |
72 | } | 73 | } |
73 | 74 | ||
74 | static int sky81452_remove(struct i2c_client *client) | ||
75 | { | ||
76 | mfd_remove_devices(&client->dev); | ||
77 | return 0; | ||
78 | } | ||
79 | |||
80 | static const struct i2c_device_id sky81452_ids[] = { | 75 | static const struct i2c_device_id sky81452_ids[] = { |
81 | { "sky81452" }, | 76 | { "sky81452" }, |
82 | { } | 77 | { } |
@@ -97,7 +92,6 @@ static struct i2c_driver sky81452_driver = { | |||
97 | .of_match_table = of_match_ptr(sky81452_of_match), | 92 | .of_match_table = of_match_ptr(sky81452_of_match), |
98 | }, | 93 | }, |
99 | .probe = sky81452_probe, | 94 | .probe = sky81452_probe, |
100 | .remove = sky81452_remove, | ||
101 | .id_table = sky81452_ids, | 95 | .id_table = sky81452_ids, |
102 | }; | 96 | }; |
103 | 97 | ||