pds_core: Rework teardown/setup flow to be more common

[linux-2.6-block.git] / drivers / pcmcia / xxs1500_ss.c

diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c
index b11c7abb1dc07e9a21487cffed56dec7b43a35d8..2a93fbbd128da99a422ed6f86c11d033bd6af45c 100644 (file)
--- a/drivers/pcmcia/xxs1500_ss.c
+++ b/drivers/pcmcia/xxs1500_ss.c
@@ -301,7 +301,7 @@ out0:
        return ret;
 }
 
-static int xxs1500_pcmcia_remove(struct platform_device *pdev)
+static void xxs1500_pcmcia_remove(struct platform_device *pdev)
 {
        struct xxs1500_pcmcia_sock *sock = platform_get_drvdata(pdev);
 
@@ -309,8 +309,6 @@ static int xxs1500_pcmcia_remove(struct platform_device *pdev)
        free_irq(gpio_to_irq(GPIO_CDA), sock);
        iounmap((void *)(sock->virt_io + (u32)mips_io_port_base));
        kfree(sock);
-
-       return 0;
 }
 
 static struct platform_driver xxs1500_pcmcia_socket_driver = {
@@ -318,7 +316,7 @@ static struct platform_driver xxs1500_pcmcia_socket_driver = {
                .name   = "xxs1500_pcmcia",
        },
        .probe          = xxs1500_pcmcia_probe,
-       .remove         = xxs1500_pcmcia_remove,
+       .remove_new     = xxs1500_pcmcia_remove,
 };
 
 module_platform_driver(xxs1500_pcmcia_socket_driver);