Skip to content

Commit

Permalink
b43: 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>
Cc: Stefano Brivio <stefano.brivio@polimi.it>
Cc: b43-dev@lists.infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Bill Pemberton authored and John W. Linville committed Dec 6, 2012
1 parent 991683c commit 157c943
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions drivers/net/wireless/b43/pcmcia.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ static int b43_pcmcia_resume(struct pcmcia_device *dev)
# define b43_pcmcia_resume NULL
#endif /* CONFIG_PM */

static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
static int b43_pcmcia_probe(struct pcmcia_device *dev)
{
struct ssb_bus *ssb;
int err = -ENOMEM;
Expand Down Expand Up @@ -110,7 +110,7 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
return err;
}

static void __devexit b43_pcmcia_remove(struct pcmcia_device *dev)
static void b43_pcmcia_remove(struct pcmcia_device *dev)
{
struct ssb_bus *ssb = dev->priv;

Expand All @@ -125,7 +125,7 @@ static struct pcmcia_driver b43_pcmcia_driver = {
.name = "b43-pcmcia",
.id_table = b43_pcmcia_tbl,
.probe = b43_pcmcia_probe,
.remove = __devexit_p(b43_pcmcia_remove),
.remove = b43_pcmcia_remove,
.suspend = b43_pcmcia_suspend,
.resume = b43_pcmcia_resume,
};
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/wireless/b43/sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void b43_sdio_free_irq(struct b43_wldev *dev)
sdio->irq_handler = NULL;
}

static int __devinit b43_sdio_probe(struct sdio_func *func,
static int b43_sdio_probe(struct sdio_func *func,
const struct sdio_device_id *id)
{
struct b43_sdio *sdio;
Expand Down Expand Up @@ -171,7 +171,7 @@ static int __devinit b43_sdio_probe(struct sdio_func *func,
return error;
}

static void __devexit b43_sdio_remove(struct sdio_func *func)
static void b43_sdio_remove(struct sdio_func *func)
{
struct b43_sdio *sdio = sdio_get_drvdata(func);

Expand All @@ -193,7 +193,7 @@ static struct sdio_driver b43_sdio_driver = {
.name = "b43-sdio",
.id_table = b43_sdio_ids,
.probe = b43_sdio_probe,
.remove = __devexit_p(b43_sdio_remove),
.remove = b43_sdio_remove,
};

int b43_sdio_init(void)
Expand Down

0 comments on commit 157c943

Please sign in to comment.