Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[J-linux.git] / drivers / net / ethernet / apm / xgene / xgene_enet_main.c

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index f3305c434c95b188e02cf2d2f641a31e08916a3d..44900026d11b5d22602af09889f445385560ad70 100644 (file)
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -2018,7 +2018,6 @@ static int xgene_enet_probe(struct platform_device *pdev)
        struct xgene_enet_pdata *pdata;
        struct device *dev = &pdev->dev;
        void (*link_state)(struct work_struct *);
-       const struct of_device_id *of_id;
        int ret;
 
        ndev = alloc_etherdev_mqs(sizeof(struct xgene_enet_pdata),
@@ -2039,19 +2038,7 @@ static int xgene_enet_probe(struct platform_device *pdev)
                          NETIF_F_GRO |
                          NETIF_F_SG;
 
-       of_id = of_match_device(xgene_enet_of_match, &pdev->dev);
-       if (of_id) {
-               pdata->enet_id = (uintptr_t)of_id->data;
-       }
-#ifdef CONFIG_ACPI
-       else {
-               const struct acpi_device_id *acpi_id;
-
-               acpi_id = acpi_match_device(xgene_enet_acpi_match, &pdev->dev);
-               if (acpi_id)
-                       pdata->enet_id = (enum xgene_enet_id) acpi_id->driver_data;
-       }
-#endif
+       pdata->enet_id = (enum xgene_enet_id)device_get_match_data(&pdev->dev);
        if (!pdata->enet_id) {
                ret = -ENODEV;
                goto err;
@@ -2127,7 +2114,7 @@ err:
        return ret;
 }
 
-static int xgene_enet_remove(struct platform_device *pdev)
+static void xgene_enet_remove(struct platform_device *pdev)
 {
        struct xgene_enet_pdata *pdata;
        struct net_device *ndev;
@@ -2149,8 +2136,6 @@ static int xgene_enet_remove(struct platform_device *pdev)
        xgene_enet_delete_desc_rings(pdata);
        pdata->port_ops->shutdown(pdata);
        free_netdev(ndev);
-
-       return 0;
 }
 
 static void xgene_enet_shutdown(struct platform_device *pdev)
@@ -2174,7 +2159,7 @@ static struct platform_driver xgene_enet_driver = {
                   .acpi_match_table = ACPI_PTR(xgene_enet_acpi_match),
        },
        .probe = xgene_enet_probe,
-       .remove = xgene_enet_remove,
+       .remove_new = xgene_enet_remove,
        .shutdown = xgene_enet_shutdown,
 };