diff options
Diffstat (limited to 'drivers/net/ethernet/amd/sunlance.c')
| -rw-r--r-- | drivers/net/ethernet/amd/sunlance.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c index d7a3533d990b..c2d696c88e46 100644 --- a/drivers/net/ethernet/amd/sunlance.c +++ b/drivers/net/ethernet/amd/sunlance.c | |||
| @@ -1304,9 +1304,9 @@ static const struct net_device_ops sparc_lance_ops = { | |||
| 1304 | .ndo_validate_addr = eth_validate_addr, | 1304 | .ndo_validate_addr = eth_validate_addr, |
| 1305 | }; | 1305 | }; |
| 1306 | 1306 | ||
| 1307 | static int __devinit sparc_lance_probe_one(struct platform_device *op, | 1307 | static int sparc_lance_probe_one(struct platform_device *op, |
| 1308 | struct platform_device *ledma, | 1308 | struct platform_device *ledma, |
| 1309 | struct platform_device *lebuffer) | 1309 | struct platform_device *lebuffer) |
| 1310 | { | 1310 | { |
| 1311 | struct device_node *dp = op->dev.of_node; | 1311 | struct device_node *dp = op->dev.of_node; |
| 1312 | static unsigned version_printed; | 1312 | static unsigned version_printed; |
| @@ -1488,7 +1488,7 @@ fail: | |||
| 1488 | return -ENODEV; | 1488 | return -ENODEV; |
| 1489 | } | 1489 | } |
| 1490 | 1490 | ||
| 1491 | static int __devinit sunlance_sbus_probe(struct platform_device *op) | 1491 | static int sunlance_sbus_probe(struct platform_device *op) |
| 1492 | { | 1492 | { |
| 1493 | struct platform_device *parent = to_platform_device(op->dev.parent); | 1493 | struct platform_device *parent = to_platform_device(op->dev.parent); |
| 1494 | struct device_node *parent_dp = parent->dev.of_node; | 1494 | struct device_node *parent_dp = parent->dev.of_node; |
| @@ -1504,7 +1504,7 @@ static int __devinit sunlance_sbus_probe(struct platform_device *op) | |||
| 1504 | return err; | 1504 | return err; |
| 1505 | } | 1505 | } |
| 1506 | 1506 | ||
| 1507 | static int __devexit sunlance_sbus_remove(struct platform_device *op) | 1507 | static int sunlance_sbus_remove(struct platform_device *op) |
| 1508 | { | 1508 | { |
| 1509 | struct lance_private *lp = dev_get_drvdata(&op->dev); | 1509 | struct lance_private *lp = dev_get_drvdata(&op->dev); |
| 1510 | struct net_device *net_dev = lp->dev; | 1510 | struct net_device *net_dev = lp->dev; |
| @@ -1536,7 +1536,7 @@ static struct platform_driver sunlance_sbus_driver = { | |||
| 1536 | .of_match_table = sunlance_sbus_match, | 1536 | .of_match_table = sunlance_sbus_match, |
| 1537 | }, | 1537 | }, |
| 1538 | .probe = sunlance_sbus_probe, | 1538 | .probe = sunlance_sbus_probe, |
| 1539 | .remove = __devexit_p(sunlance_sbus_remove), | 1539 | .remove = sunlance_sbus_remove, |
| 1540 | }; | 1540 | }; |
| 1541 | 1541 | ||
| 1542 | module_platform_driver(sunlance_sbus_driver); | 1542 | module_platform_driver(sunlance_sbus_driver); |
