|
@@ -48,7 +48,7 @@
|
|
|
#define AXIENET_REGS_N 32
|
|
|
|
|
|
/* Match table for of_platform binding */
|
|
|
-static struct of_device_id axienet_of_match[] __devinitdata = {
|
|
|
+static struct of_device_id axienet_of_match[] = {
|
|
|
{ .compatible = "xlnx,axi-ethernet-1.00.a", },
|
|
|
{ .compatible = "xlnx,axi-ethernet-1.01.a", },
|
|
|
{ .compatible = "xlnx,axi-ethernet-2.01.a", },
|
|
@@ -1482,7 +1482,7 @@ static void axienet_dma_err_handler(unsigned long data)
|
|
|
* device. Parses through device tree and populates fields of
|
|
|
* axienet_local. It registers the Ethernet device.
|
|
|
*/
|
|
|
-static int __devinit axienet_of_probe(struct platform_device *op)
|
|
|
+static int axienet_of_probe(struct platform_device *op)
|
|
|
{
|
|
|
__be32 *p;
|
|
|
int size, ret = 0;
|
|
@@ -1632,7 +1632,7 @@ nodev:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int __devexit axienet_of_remove(struct platform_device *op)
|
|
|
+static int axienet_of_remove(struct platform_device *op)
|
|
|
{
|
|
|
struct net_device *ndev = dev_get_drvdata(&op->dev);
|
|
|
struct axienet_local *lp = netdev_priv(ndev);
|
|
@@ -1656,7 +1656,7 @@ static int __devexit axienet_of_remove(struct platform_device *op)
|
|
|
|
|
|
static struct platform_driver axienet_of_driver = {
|
|
|
.probe = axienet_of_probe,
|
|
|
- .remove = __devexit_p(axienet_of_remove),
|
|
|
+ .remove = axienet_of_remove,
|
|
|
.driver = {
|
|
|
.owner = THIS_MODULE,
|
|
|
.name = "xilinx_axienet",
|