Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / mfd / atmel-hlcdc.c

diff --git a/drivers/mfd/atmel-hlcdc.c b/drivers/mfd/atmel-hlcdc.c
index 06c205868573e8d7d7b98e1c142156a2cc572454..eca7ea69b81c8c16085f98a803da511589599b37 100644 (file)
--- a/drivers/mfd/atmel-hlcdc.c
+++ b/drivers/mfd/atmel-hlcdc.c
@@ -128,16 +128,9 @@ static int atmel_hlcdc_probe(struct platform_device *pdev)
 
        dev_set_drvdata(dev, hlcdc);
 
-       return mfd_add_devices(dev, -1, atmel_hlcdc_cells,
-                              ARRAY_SIZE(atmel_hlcdc_cells),
-                              NULL, 0, NULL);
-}
-
-static int atmel_hlcdc_remove(struct platform_device *pdev)
-{
-       mfd_remove_devices(&pdev->dev);
-
-       return 0;
+       return devm_mfd_add_devices(dev, -1, atmel_hlcdc_cells,
+                                   ARRAY_SIZE(atmel_hlcdc_cells),
+                                   NULL, 0, NULL);
 }
 
 static const struct of_device_id atmel_hlcdc_match[] = {
@@ -152,7 +145,6 @@ MODULE_DEVICE_TABLE(of, atmel_hlcdc_match);
 
 static struct platform_driver atmel_hlcdc_driver = {
        .probe = atmel_hlcdc_probe,
-       .remove = atmel_hlcdc_remove,
        .driver = {
                .name = "atmel-hlcdc",
                .of_match_table = atmel_hlcdc_match,