bcma: convert to platform remove callback returning void

[linux-2.6-block.git] / drivers / bcma / host_soc.c

diff --git a/drivers/bcma/host_soc.c b/drivers/bcma/host_soc.c
index 90d5bdc12e0337f28b213b219d72056972683531..8ae0b918e74038d00603304f5e4c2e33529fe07d 100644 (file)
--- a/drivers/bcma/host_soc.c
+++ b/drivers/bcma/host_soc.c
@@ -240,15 +240,13 @@ err_unmap_mmio:
        return err;
 }
 
-static int bcma_host_soc_remove(struct platform_device *pdev)
+static void bcma_host_soc_remove(struct platform_device *pdev)
 {
        struct bcma_bus *bus = platform_get_drvdata(pdev);
 
        bcma_bus_unregister(bus);
        iounmap(bus->mmio);
        platform_set_drvdata(pdev, NULL);
-
-       return 0;
 }
 
 static const struct of_device_id bcma_host_soc_of_match[] = {
@@ -263,7 +261,7 @@ static struct platform_driver bcma_host_soc_driver = {
                .of_match_table = bcma_host_soc_of_match,
        },
        .probe          = bcma_host_soc_probe,
-       .remove         = bcma_host_soc_remove,
+       .remove_new     = bcma_host_soc_remove,
 };
 
 int __init bcma_host_soc_register_driver(void)