drm/omapdrm: Add gamma table support to DSS dispc

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

diff --git a/drivers/mfd/tps6507x.c b/drivers/mfd/tps6507x.c
index 1ab3dd6c8adf97e721ab469a9249d168ef1c9893..40beb2f4350c596decfe06ec477805cdc004554c 100644 (file)
--- a/drivers/mfd/tps6507x.c
+++ b/drivers/mfd/tps6507x.c
@@ -100,16 +100,8 @@ static int tps6507x_i2c_probe(struct i2c_client *i2c,
        tps6507x->read_dev = tps6507x_i2c_read_device;
        tps6507x->write_dev = tps6507x_i2c_write_device;
 
-       return mfd_add_devices(tps6507x->dev, -1, tps6507x_devs,
-                              ARRAY_SIZE(tps6507x_devs), NULL, 0, NULL);
-}
-
-static int tps6507x_i2c_remove(struct i2c_client *i2c)
-{
-       struct tps6507x_dev *tps6507x = i2c_get_clientdata(i2c);
-
-       mfd_remove_devices(tps6507x->dev);
-       return 0;
+       return devm_mfd_add_devices(tps6507x->dev, -1, tps6507x_devs,
+                                   ARRAY_SIZE(tps6507x_devs), NULL, 0, NULL);
 }
 
 static const struct i2c_device_id tps6507x_i2c_id[] = {
@@ -132,7 +124,6 @@ static struct i2c_driver tps6507x_i2c_driver = {
                   .of_match_table = of_match_ptr(tps6507x_of_match),
        },
        .probe = tps6507x_i2c_probe,
-       .remove = tps6507x_i2c_remove,
        .id_table = tps6507x_i2c_id,
 };