Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / pcmcia / vrc4171_card.c

diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c
index 86e4a1a..75806be 100644 (file)
--- a/drivers/pcmcia/vrc4171_card.c
+++ b/drivers/pcmcia/vrc4171_card.c
@@ -564,7 +564,7 @@ static inline void reserve_using_irq(int slot)
        vrc4171_irq_mask &= ~(1 << irq);
 }
 
-static int __devinit vrc4171_add_sockets(void)
+static int vrc4171_add_sockets(void)
 {
        vrc4171_socket_t *socket;
        int slot, retval;
@@ -631,7 +631,7 @@ static void vrc4171_remove_sockets(void)
        }
 }
 
-static int __devinit vrc4171_card_setup(char *options)
+static int vrc4171_card_setup(char *options)
 {
        if (options == NULL || *options == '\0')
                return 1;
@@ -712,7 +712,7 @@ static struct platform_driver vrc4171_card_driver = {
        },
 };
 
-static int __devinit vrc4171_card_init(void)
+static int vrc4171_card_init(void)
 {
        int retval;
 
@@ -746,7 +746,7 @@ static int __devinit vrc4171_card_init(void)
        return 0;
 }
 
-static void __devexit vrc4171_card_exit(void)
+static void vrc4171_card_exit(void)
 {
        free_irq(vrc4171_irq, vrc4171_sockets);
        vrc4171_remove_sockets();