diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:56:30 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-12-06 15:04:56 -0500 |
commit | 157c9436e6e740b0fb3f3c10da0e2f68731a8052 (patch) | |
tree | 4eb9d97958758429f4bce3968117e633cc76c4ba /drivers/net/wireless/b43/pcmcia.c | |
parent | 991683ca49908a78ff00942d6832523657e578b7 (diff) |
b43: 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>
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>
Diffstat (limited to 'drivers/net/wireless/b43/pcmcia.c')
-rw-r--r-- | drivers/net/wireless/b43/pcmcia.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c index 714cad649c45..f2ea2ceec8a9 100644 --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c | |||
@@ -60,7 +60,7 @@ static int b43_pcmcia_resume(struct pcmcia_device *dev) | |||
60 | # define b43_pcmcia_resume NULL | 60 | # define b43_pcmcia_resume NULL |
61 | #endif /* CONFIG_PM */ | 61 | #endif /* CONFIG_PM */ |
62 | 62 | ||
63 | static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev) | 63 | static int b43_pcmcia_probe(struct pcmcia_device *dev) |
64 | { | 64 | { |
65 | struct ssb_bus *ssb; | 65 | struct ssb_bus *ssb; |
66 | int err = -ENOMEM; | 66 | int err = -ENOMEM; |
@@ -110,7 +110,7 @@ out_error: | |||
110 | return err; | 110 | return err; |
111 | } | 111 | } |
112 | 112 | ||
113 | static void __devexit b43_pcmcia_remove(struct pcmcia_device *dev) | 113 | static void b43_pcmcia_remove(struct pcmcia_device *dev) |
114 | { | 114 | { |
115 | struct ssb_bus *ssb = dev->priv; | 115 | struct ssb_bus *ssb = dev->priv; |
116 | 116 | ||
@@ -125,7 +125,7 @@ static struct pcmcia_driver b43_pcmcia_driver = { | |||
125 | .name = "b43-pcmcia", | 125 | .name = "b43-pcmcia", |
126 | .id_table = b43_pcmcia_tbl, | 126 | .id_table = b43_pcmcia_tbl, |
127 | .probe = b43_pcmcia_probe, | 127 | .probe = b43_pcmcia_probe, |
128 | .remove = __devexit_p(b43_pcmcia_remove), | 128 | .remove = b43_pcmcia_remove, |
129 | .suspend = b43_pcmcia_suspend, | 129 | .suspend = b43_pcmcia_suspend, |
130 | .resume = b43_pcmcia_resume, | 130 | .resume = b43_pcmcia_resume, |
131 | }; | 131 | }; |