Skip to content

Commit

Permalink
ieee802154: remove __dev* attributes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Dec 3, 2012
1 parent 6e94549 commit bb1f460
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions drivers/net/ieee802154/at86rf230.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -920,7 +920,7 @@ static int __devinit at86rf230_probe(struct spi_device *spi)
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);

Expand All @@ -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,
};
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ieee802154/fakehard.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -412,7 +412,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
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);
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ieee802154/fakelb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -253,7 +253,7 @@ static int __devinit fakelb_probe(struct platform_device *pdev)
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;
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ieee802154/mrf24j40.c
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ static void mrf24j40_isrwork(struct work_struct *work)
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;
Expand Down Expand Up @@ -711,7 +711,7 @@ static int __devinit mrf24j40_probe(struct spi_device *spi)
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);

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit bb1f460

Please sign in to comment.