Merge ath-next from ath.git

[deliverable/linux.git] / drivers / mfd / stw481x.c

diff --git a/drivers/mfd/stw481x.c b/drivers/mfd/stw481x.c
index ca613df36143888f2c0848d27e9dd31404087e11..ab949eaca6ad82edee77c443efb220c6a81b8a23 100644 (file)
--- a/drivers/mfd/stw481x.c
+++ b/drivers/mfd/stw481x.c
@@ -206,8 +206,8 @@ static int stw481x_probe(struct i2c_client *client,
                stw481x_cells[i].pdata_size = sizeof(*stw481x);
        }
 
-       ret = mfd_add_devices(&client->dev, 0, stw481x_cells,
-                       ARRAY_SIZE(stw481x_cells), NULL, 0, NULL);
+       ret = devm_mfd_add_devices(&client->dev, 0, stw481x_cells,
+                                  ARRAY_SIZE(stw481x_cells), NULL, 0, NULL);
        if (ret)
                return ret;
 
@@ -216,12 +216,6 @@ static int stw481x_probe(struct i2c_client *client,
        return ret;
 }
 
-static int stw481x_remove(struct i2c_client *client)
-{
-       mfd_remove_devices(&client->dev);
-       return 0;
-}
-
 /*
  * This ID table is completely unused, as this is a pure
  * device-tree probed driver, but it has to be here due to
@@ -246,7 +240,6 @@ static struct i2c_driver stw481x_driver = {
                .of_match_table = stw481x_match,
        },
        .probe          = stw481x_probe,
-       .remove         = stw481x_remove,
        .id_table       = stw481x_id,
 };