Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[firefly-linux-kernel-4.4.55.git] / drivers / net / ieee802154 / mrf24j40.c

diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index ed7521693980e43241a71b6369b0a22b7b8ab460..3f2c7aaf28c4be64356cfc0149dfc486389ae380 100644 (file)
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -618,7 +618,7 @@ out:
        enable_irq(devrec->spi->irq);
 }
 
-static int __devinit mrf24j40_probe(struct spi_device *spi)
+static int mrf24j40_probe(struct spi_device *spi)
 {
        int ret = -ENOMEM;
        u8 val;
@@ -711,7 +711,7 @@ err_devrec:
        return ret;
 }
 
-static int __devexit mrf24j40_remove(struct spi_device *spi)
+static int mrf24j40_remove(struct spi_device *spi)
 {
        struct mrf24j40 *devrec = dev_get_drvdata(&spi->dev);
 
@@ -746,7 +746,7 @@ static struct spi_driver mrf24j40_driver = {
        },
        .id_table = mrf24j40_ids,
        .probe = mrf24j40_probe,
-       .remove = __devexit_p(mrf24j40_remove),
+       .remove = mrf24j40_remove,
 };
 
 static int __init mrf24j40_init(void)