ieee802154: remove __dev* attributes

CONFIG_HOTPLUG is going away as an option.  As result the __dev*
markings will be going away.

Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index ba753d87a32f5120a8ebf1a8e8641273259db65f..a4a62e170ec08533773881189eeaea63c4a0cdf0 100644 (file)
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -778,7 +778,7 @@ static int at86rf230_fill_data(struct spi_device *spi)
        return 0;
 }
 
-static int __devinit at86rf230_probe(struct spi_device *spi)
+static int at86rf230_probe(struct spi_device *spi)
 {
        struct ieee802154_dev *dev;
        struct at86rf230_local *lp;
@@ -920,7 +920,7 @@ err_fill:
        return rc;
 }
 
-static int __devexit at86rf230_remove(struct spi_device *spi)
+static int at86rf230_remove(struct spi_device *spi)
 {
        struct at86rf230_local *lp = spi_get_drvdata(spi);
 
@@ -947,7 +947,7 @@ static struct spi_driver at86rf230_driver = {
                .owner  = THIS_MODULE,
        },
        .probe      = at86rf230_probe,
-       .remove     = __devexit_p(at86rf230_remove),
+       .remove     = at86rf230_remove,
        .suspend    = at86rf230_suspend,
        .resume     = at86rf230_resume,
 };

diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
index 7d39add7d467712f8cb21ec9aee4d01cd6606c7f..1e9cb0bbf62cbcf0c4738388802560ab961f0657 100644 (file)
--- a/drivers/net/ieee802154/fakehard.c
+++ b/drivers/net/ieee802154/fakehard.c
@@ -354,7 +354,7 @@ static void ieee802154_fake_setup(struct net_device *dev)
 }
 
 
-static int __devinit ieee802154fake_probe(struct platform_device *pdev)
+static int ieee802154fake_probe(struct platform_device *pdev)
 {
        struct net_device *dev;
        struct fakehard_priv *priv;
@@ -412,7 +412,7 @@ out:
        return err;
 }
 
-static int __devexit ieee802154fake_remove(struct platform_device *pdev)
+static int ieee802154fake_remove(struct platform_device *pdev)
 {
        struct net_device *dev = platform_get_drvdata(pdev);
        unregister_netdev(dev);
@@ -423,7 +423,7 @@ static struct platform_device *ieee802154fake_dev;
 
 static struct platform_driver ieee802154fake_driver = {
        .probe = ieee802154fake_probe,
-       .remove = __devexit_p(ieee802154fake_remove),
+       .remove = ieee802154fake_remove,
        .driver = {
                        .name = "ieee802154hardmac",
                        .owner = THIS_MODULE,

diff --git a/drivers/net/ieee802154/fakelb.c b/drivers/net/ieee802154/fakelb.c
index e7456fcd0913fbaf09d146112d9d3c9ab539cae0..b8d22173925dee1aed62df3ccd4d23deb44b976b 100644 (file)
--- a/drivers/net/ieee802154/fakelb.c
+++ b/drivers/net/ieee802154/fakelb.c
@@ -221,7 +221,7 @@ static void fakelb_del(struct fakelb_dev_priv *priv)
        ieee802154_free_device(priv->dev);
 }
 
-static int __devinit fakelb_probe(struct platform_device *pdev)
+static int fakelb_probe(struct platform_device *pdev)
 {
        struct fakelb_priv *priv;
        struct fakelb_dev_priv *dp;
@@ -253,7 +253,7 @@ err_alloc:
        return err;
 }
 
-static int __devexit fakelb_remove(struct platform_device *pdev)
+static int fakelb_remove(struct platform_device *pdev)
 {
        struct fakelb_priv *priv = platform_get_drvdata(pdev);
        struct fakelb_dev_priv *dp, *temp;
@@ -269,7 +269,7 @@ static struct platform_device *ieee802154fake_dev;
 
 static struct platform_driver ieee802154fake_driver = {
        .probe = fakelb_probe,
-       .remove = __devexit_p(fakelb_remove),
+       .remove = fakelb_remove,
        .driver = {
                        .name = "ieee802154fakelb",
                        .owner = THIS_MODULE,

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)