Merge tag 'fixes-rcu-fiq-signed' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / mfd / rdc321x-southbridge.c

diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c
index 6575585f1d1f0eed3933383d1432cbaa40ba8dbe..2bd8c5b6d600a7824b8c9f437fb75b21f0f01b2e 100644 (file)
--- a/drivers/mfd/rdc321x-southbridge.c
+++ b/drivers/mfd/rdc321x-southbridge.c
@@ -85,14 +85,10 @@ static int rdc321x_sb_probe(struct pci_dev *pdev,
        rdc321x_gpio_pdata.sb_pdev = pdev;
        rdc321x_wdt_pdata.sb_pdev = pdev;
 
-       return mfd_add_devices(&pdev->dev, -1,
-                              rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells),
-                              NULL, 0, NULL);
-}
-
-static void rdc321x_sb_remove(struct pci_dev *pdev)
-{
-       mfd_remove_devices(&pdev->dev);
+       return devm_mfd_add_devices(&pdev->dev, -1,
+                                   rdc321x_sb_cells,
+                                   ARRAY_SIZE(rdc321x_sb_cells),
+                                   NULL, 0, NULL);
 }
 
 static const struct pci_device_id rdc321x_sb_table[] = {
@@ -105,7 +101,6 @@ static struct pci_driver rdc321x_sb_driver = {
        .name           = "RDC321x Southbridge",
        .id_table       = rdc321x_sb_table,
        .probe          = rdc321x_sb_probe,
-       .remove         = rdc321x_sb_remove,
 };
 
 module_pci_driver(rdc321x_sb_driver);