Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / mfd / rk808.c

diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index 4b1e439..49d7f62 100644 (file)
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -213,9 +213,9 @@ static int rk808_probe(struct i2c_client *client,
        rk808->i2c = client;
        i2c_set_clientdata(client, rk808);
 
-       ret = mfd_add_devices(&client->dev, -1,
-                             rk808s, ARRAY_SIZE(rk808s),
-                             NULL, 0, regmap_irq_get_domain(rk808->irq_data));
+       ret = devm_mfd_add_devices(&client->dev, -1,
+                                  rk808s, ARRAY_SIZE(rk808s), NULL, 0,
+                                  regmap_irq_get_domain(rk808->irq_data));
        if (ret) {
                dev_err(&client->dev, "failed to add MFD devices %d\n", ret);
                goto err_irq;
@@ -240,7 +240,6 @@ static int rk808_remove(struct i2c_client *client)
        struct rk808 *rk808 = i2c_get_clientdata(client);
 
        regmap_del_irq_chip(client->irq, rk808->irq_data);
-       mfd_remove_devices(&client->dev);
        pm_power_off = NULL;
 
        return 0;