mptcp: really cope with fastopen race

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

diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 5254028354f401b72a5a258ab391c2edb75576be..457fb81b497a10de69ec58973df4247bad244bbc 100644 (file)
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -313,15 +313,13 @@ err0:
        return ret;
 }
 
-static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev)
+static void pxa2xx_drv_pcmcia_remove(struct platform_device *dev)
 {
        struct skt_dev_info *sinfo = platform_get_drvdata(dev);
        int i;
 
        for (i = 0; i < sinfo->nskt; i++)
                soc_pcmcia_remove_one(&sinfo->skt[i]);
-
-       return 0;
 }
 
 static int pxa2xx_drv_pcmcia_resume(struct device *dev)
@@ -338,7 +336,7 @@ static const struct dev_pm_ops pxa2xx_drv_pcmcia_pm_ops = {
 
 static struct platform_driver pxa2xx_pcmcia_driver = {
        .probe          = pxa2xx_drv_pcmcia_probe,
-       .remove         = pxa2xx_drv_pcmcia_remove,
+       .remove_new     = pxa2xx_drv_pcmcia_remove,
        .driver         = {
                .name   = "pxa2xx-pcmcia",
                .pm     = &pxa2xx_drv_pcmcia_pm_ops,