aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/natsemi/jazzsonic.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 09:23:17 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 14:16:44 -0500
commit6980cbe4a6dbb3d7871e99a3cbc74a572d14d327 (patch)
treeb29d3eac138b545f555dc79f24e397b09f8303ae /drivers/net/ethernet/natsemi/jazzsonic.c
parent19d1b44aa8eba6304abdfe9761bb941f38b512f5 (diff)
natsemi: 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>
Diffstat (limited to 'drivers/net/ethernet/natsemi/jazzsonic.c')
-rw-r--r--drivers/net/ethernet/natsemi/jazzsonic.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/natsemi/jazzsonic.c b/drivers/net/ethernet/natsemi/jazzsonic.c
index 95dd39ffb230..b0b361546365 100644
--- a/drivers/net/ethernet/natsemi/jazzsonic.c
+++ b/drivers/net/ethernet/natsemi/jazzsonic.c
@@ -117,7 +117,7 @@ static const struct net_device_ops sonic_netdev_ops = {
117 .ndo_set_mac_address = eth_mac_addr, 117 .ndo_set_mac_address = eth_mac_addr,
118}; 118};
119 119
120static int __devinit sonic_probe1(struct net_device *dev) 120static int sonic_probe1(struct net_device *dev)
121{ 121{
122 static unsigned version_printed; 122 static unsigned version_printed;
123 unsigned int silicon_revision; 123 unsigned int silicon_revision;
@@ -220,7 +220,7 @@ out:
220 * Probe for a SONIC ethernet controller on a Mips Jazz board. 220 * Probe for a SONIC ethernet controller on a Mips Jazz board.
221 * Actually probing is superfluous but we're paranoid. 221 * Actually probing is superfluous but we're paranoid.
222 */ 222 */
223static int __devinit jazz_sonic_probe(struct platform_device *pdev) 223static int jazz_sonic_probe(struct platform_device *pdev)
224{ 224{
225 struct net_device *dev; 225 struct net_device *dev;
226 struct sonic_local *lp; 226 struct sonic_local *lp;
@@ -270,7 +270,7 @@ MODULE_ALIAS("platform:jazzsonic");
270 270
271#include "sonic.c" 271#include "sonic.c"
272 272
273static int __devexit jazz_sonic_device_remove (struct platform_device *pdev) 273static int jazz_sonic_device_remove(struct platform_device *pdev)
274{ 274{
275 struct net_device *dev = platform_get_drvdata(pdev); 275 struct net_device *dev = platform_get_drvdata(pdev);
276 struct sonic_local* lp = netdev_priv(dev); 276 struct sonic_local* lp = netdev_priv(dev);
@@ -286,7 +286,7 @@ static int __devexit jazz_sonic_device_remove (struct platform_device *pdev)
286 286
287static struct platform_driver jazz_sonic_driver = { 287static struct platform_driver jazz_sonic_driver = {
288 .probe = jazz_sonic_probe, 288 .probe = jazz_sonic_probe,
289 .remove = __devexit_p(jazz_sonic_device_remove), 289 .remove = jazz_sonic_device_remove,
290 .driver = { 290 .driver = {
291 .name = jazz_sonic_string, 291 .name = jazz_sonic_string,
292 .owner = THIS_MODULE, 292 .owner = THIS_MODULE,