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>
This commit is contained in:
Bill Pemberton 2012-12-03 09:56:30 -05:00 коммит произвёл John W. Linville
Родитель 991683ca49
Коммит 157c9436e6
2 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -60,7 +60,7 @@ static int b43_pcmcia_resume(struct pcmcia_device *dev)
# define b43_pcmcia_resume NULL # define b43_pcmcia_resume NULL
#endif /* CONFIG_PM */ #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; struct ssb_bus *ssb;
int err = -ENOMEM; int err = -ENOMEM;
@ -110,7 +110,7 @@ out_error:
return err; 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; struct ssb_bus *ssb = dev->priv;
@ -125,7 +125,7 @@ static struct pcmcia_driver b43_pcmcia_driver = {
.name = "b43-pcmcia", .name = "b43-pcmcia",
.id_table = b43_pcmcia_tbl, .id_table = b43_pcmcia_tbl,
.probe = b43_pcmcia_probe, .probe = b43_pcmcia_probe,
.remove = __devexit_p(b43_pcmcia_remove), .remove = b43_pcmcia_remove,
.suspend = b43_pcmcia_suspend, .suspend = b43_pcmcia_suspend,
.resume = b43_pcmcia_resume, .resume = b43_pcmcia_resume,
}; };

Просмотреть файл

@ -93,7 +93,7 @@ void b43_sdio_free_irq(struct b43_wldev *dev)
sdio->irq_handler = NULL; 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) const struct sdio_device_id *id)
{ {
struct b43_sdio *sdio; struct b43_sdio *sdio;
@ -171,7 +171,7 @@ out:
return error; 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); struct b43_sdio *sdio = sdio_get_drvdata(func);
@ -193,7 +193,7 @@ static struct sdio_driver b43_sdio_driver = {
.name = "b43-sdio", .name = "b43-sdio",
.id_table = b43_sdio_ids, .id_table = b43_sdio_ids,
.probe = b43_sdio_probe, .probe = b43_sdio_probe,
.remove = __devexit_p(b43_sdio_remove), .remove = b43_sdio_remove,
}; };
int b43_sdio_init(void) int b43_sdio_init(void)