diff options
author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-04-07 14:43:08 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2016-04-19 02:56:17 -0400 |
commit | 6b719eba9f01cd65ede04e64f20f648f8dbe6359 (patch) | |
tree | 98906f04229f632026f82680233177b8be106959 /drivers/mfd | |
parent | f41206c9fd5c48becdb0f2f65328c5438f6ea34d (diff) |
mfd: rt5033: 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: Ingi Kim <ingi2.kim@samsung.com>
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/rt5033.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/mfd/rt5033.c b/drivers/mfd/rt5033.c index 2b95485f0057..9bd089c56375 100644 --- a/drivers/mfd/rt5033.c +++ b/drivers/mfd/rt5033.c | |||
@@ -97,9 +97,9 @@ static int rt5033_i2c_probe(struct i2c_client *i2c, | |||
97 | return ret; | 97 | return ret; |
98 | } | 98 | } |
99 | 99 | ||
100 | ret = mfd_add_devices(rt5033->dev, -1, rt5033_devs, | 100 | ret = devm_mfd_add_devices(rt5033->dev, -1, rt5033_devs, |
101 | ARRAY_SIZE(rt5033_devs), NULL, 0, | 101 | ARRAY_SIZE(rt5033_devs), NULL, 0, |
102 | regmap_irq_get_domain(rt5033->irq_data)); | 102 | regmap_irq_get_domain(rt5033->irq_data)); |
103 | if (ret < 0) { | 103 | if (ret < 0) { |
104 | dev_err(&i2c->dev, "Failed to add RT5033 child devices.\n"); | 104 | dev_err(&i2c->dev, "Failed to add RT5033 child devices.\n"); |
105 | return ret; | 105 | return ret; |
@@ -110,13 +110,6 @@ static int rt5033_i2c_probe(struct i2c_client *i2c, | |||
110 | return 0; | 110 | return 0; |
111 | } | 111 | } |
112 | 112 | ||
113 | static int rt5033_i2c_remove(struct i2c_client *i2c) | ||
114 | { | ||
115 | mfd_remove_devices(&i2c->dev); | ||
116 | |||
117 | return 0; | ||
118 | } | ||
119 | |||
120 | static const struct i2c_device_id rt5033_i2c_id[] = { | 113 | static const struct i2c_device_id rt5033_i2c_id[] = { |
121 | { "rt5033", }, | 114 | { "rt5033", }, |
122 | { } | 115 | { } |
@@ -135,7 +128,6 @@ static struct i2c_driver rt5033_driver = { | |||
135 | .of_match_table = of_match_ptr(rt5033_dt_match), | 128 | .of_match_table = of_match_ptr(rt5033_dt_match), |
136 | }, | 129 | }, |
137 | .probe = rt5033_i2c_probe, | 130 | .probe = rt5033_i2c_probe, |
138 | .remove = rt5033_i2c_remove, | ||
139 | .id_table = rt5033_i2c_id, | 131 | .id_table = rt5033_i2c_id, |
140 | }; | 132 | }; |
141 | module_i2c_driver(rt5033_driver); | 133 | module_i2c_driver(rt5033_driver); |