|
@@ -1612,7 +1612,7 @@ static const struct net_device_ops bcm_enet_ops = {
|
|
|
/*
|
|
|
* allocate netdevice, request register memory and register device.
|
|
|
*/
|
|
|
-static int __devinit bcm_enet_probe(struct platform_device *pdev)
|
|
|
+static int bcm_enet_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct bcm_enet_priv *priv;
|
|
|
struct net_device *dev;
|
|
@@ -1830,7 +1830,7 @@ out:
|
|
|
/*
|
|
|
* exit func, stops hardware and unregisters netdevice
|
|
|
*/
|
|
|
-static int __devexit bcm_enet_remove(struct platform_device *pdev)
|
|
|
+static int bcm_enet_remove(struct platform_device *pdev)
|
|
|
{
|
|
|
struct bcm_enet_priv *priv;
|
|
|
struct net_device *dev;
|
|
@@ -1877,7 +1877,7 @@ static int __devexit bcm_enet_remove(struct platform_device *pdev)
|
|
|
|
|
|
struct platform_driver bcm63xx_enet_driver = {
|
|
|
.probe = bcm_enet_probe,
|
|
|
- .remove = __devexit_p(bcm_enet_remove),
|
|
|
+ .remove = bcm_enet_remove,
|
|
|
.driver = {
|
|
|
.name = "bcm63xx_enet",
|
|
|
.owner = THIS_MODULE,
|
|
@@ -1887,7 +1887,7 @@ struct platform_driver bcm63xx_enet_driver = {
|
|
|
/*
|
|
|
* reserve & remap memory space shared between all macs
|
|
|
*/
|
|
|
-static int __devinit bcm_enet_shared_probe(struct platform_device *pdev)
|
|
|
+static int bcm_enet_shared_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct resource *res;
|
|
|
unsigned int iomem_size;
|
|
@@ -1908,7 +1908,7 @@ static int __devinit bcm_enet_shared_probe(struct platform_device *pdev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int __devexit bcm_enet_shared_remove(struct platform_device *pdev)
|
|
|
+static int bcm_enet_shared_remove(struct platform_device *pdev)
|
|
|
{
|
|
|
struct resource *res;
|
|
|
|
|
@@ -1924,7 +1924,7 @@ static int __devexit bcm_enet_shared_remove(struct platform_device *pdev)
|
|
|
*/
|
|
|
struct platform_driver bcm63xx_enet_shared_driver = {
|
|
|
.probe = bcm_enet_shared_probe,
|
|
|
- .remove = __devexit_p(bcm_enet_shared_remove),
|
|
|
+ .remove = bcm_enet_shared_remove,
|
|
|
.driver = {
|
|
|
.name = "bcm63xx_enet_shared",
|
|
|
.owner = THIS_MODULE,
|