1 files changed, 10 insertions, 17 deletions

diff --git a/drivers/net/ethernet/cadence/macb_pci.c b/drivers/net/ethernet/cadence/macb_pci.c
index 92be2cd8f817..9906fda76087 100644
--- a/drivers/net/ethernet/cadence/macb_pci.c
+++ b/drivers/net/ethernet/cadence/macb_pci.c
@@ -1,5 +1,5 @@
 /**
- * macb_pci.c - Cadence GEM PCI wrapper.
+ * Cadence GEM PCI wrapper.
  *
  * Copyright (C) 2016 Cadence Design Systems - http://www.cadence.com
  *
@@ -45,32 +45,27 @@ static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         struct macb_platform_data plat_data;
         struct resource res[2];
 
-        /* sanity check */
-        if (!id)
-                return -EINVAL;
-
         /* enable pci device */
-        err = pci_enable_device(pdev);
+        err = pcim_enable_device(pdev);
         if (err < 0) {
-                dev_err(&pdev->dev, "Enabling PCI device has failed: 0x%04X",
-                        err);
-                return -EACCES;
+                dev_err(&pdev->dev, "Enabling PCI device has failed: %d", err);
+                return err;
         }
 
         pci_set_master(pdev);
 
         /* set up resources */
         memset(res, 0x00, sizeof(struct resource) * ARRAY_SIZE(res));
-        res[0].start = pdev->resource[0].start;
-        res[0].end = pdev->resource[0].end;
+        res[0].start = pci_resource_start(pdev, 0);
+        res[0].end = pci_resource_end(pdev, 0);
         res[0].name = PCI_DRIVER_NAME;
         res[0].flags = IORESOURCE_MEM;
-        res[1].start = pdev->irq;
+        res[1].start = pci_irq_vector(pdev, 0);
         res[1].name = PCI_DRIVER_NAME;
         res[1].flags = IORESOURCE_IRQ;
 
-        dev_info(&pdev->dev, "EMAC physical base addr = 0x%p\n",
-                 (void *)(uintptr_t)pci_resource_start(pdev, 0));
+        dev_info(&pdev->dev, "EMAC physical base addr: %pa\n",
+                 &res[0].start);
 
         /* set up macb platform data */
         memset(&plat_data, 0, sizeof(plat_data));
@@ -100,7 +95,7 @@ static int macb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         plat_info.num_res = ARRAY_SIZE(res);
         plat_info.data = &plat_data;
         plat_info.size_data = sizeof(plat_data);
-        plat_info.dma_mask = DMA_BIT_MASK(32);
+        plat_info.dma_mask = pdev->dma_mask;
 
         /* register platform device */
         plat_dev = platform_device_register_full(&plat_info);
@@ -120,7 +115,6 @@ err_hclk_register:
         clk_unregister(plat_data.pclk);
 
 err_pclk_register:
-        pci_disable_device(pdev);
         return err;
 }
 
@@ -130,7 +124,6 @@ static void macb_remove(struct pci_dev *pdev)
         struct macb_platform_data *plat_data = dev_get_platdata(&plat_dev->dev);
 
         platform_device_unregister(plat_dev);
-        pci_disable_device(pdev);
         clk_unregister(plat_data->pclk);
         clk_unregister(plat_data->hclk);
 }