1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index 6d5a914b9619..765fa2b3d337 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -788,8 +788,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data)
         return get_disk(swd->unit[drive].disk);
 }
 
-static int __devinit swim_add_floppy(struct swim_priv *swd,
-                                     enum drive_location location)
+static int swim_add_floppy(struct swim_priv *swd, enum drive_location location)
 {
         struct floppy_state *fs = &swd->unit[swd->floppy_count];
         struct swim __iomem *base = swd->base;
@@ -812,7 +811,7 @@ static int __devinit swim_add_floppy(struct swim_priv *swd,
         return 0;
 }
 
-static int __devinit swim_floppy_init(struct swim_priv *swd)
+static int swim_floppy_init(struct swim_priv *swd)
 {
         int err;
         int drive;
@@ -875,7 +874,7 @@ exit_put_disks:
         return err;
 }
 
-static int __devinit swim_probe(struct platform_device *dev)
+static int swim_probe(struct platform_device *dev)
 {
         struct resource *res;
         struct swim __iomem *swim_base;
@@ -936,7 +935,7 @@ out:
         return ret;
 }
 
-static int __devexit swim_remove(struct platform_device *dev)
+static int swim_remove(struct platform_device *dev)
 {
         struct swim_priv *swd = platform_get_drvdata(dev);
         int drive;
@@ -972,7 +971,7 @@ static int __devexit swim_remove(struct platform_device *dev)
 
 static struct platform_driver swim_driver = {
         .probe  = swim_probe,
-        .remove = __devexit_p(swim_remove),
+        .remove = swim_remove,
         .driver   = {
                 .name   = CARDNAME,
                 .owner  = THIS_MODULE,