1 files changed, 10 insertions, 59 deletions

diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c
index 58ffd30dcc91..fe088b40daf9 100644
--- a/drivers/misc/mei/pci-txe.c
+++ b/drivers/misc/mei/pci-txe.c
@@ -52,17 +52,6 @@ static inline void mei_txe_set_pm_domain(struct mei_device *dev) {}
 static inline void mei_txe_unset_pm_domain(struct mei_device *dev) {}
 #endif /* CONFIG_PM */
 
-static void mei_txe_pci_iounmap(struct pci_dev *pdev, struct mei_txe_hw *hw)
-{
-        int i;
-
-        for (i = SEC_BAR; i < NUM_OF_MEM_BARS; i++) {
-                if (hw->mem_addr[i]) {
-                        pci_iounmap(pdev, hw->mem_addr[i]);
-                        hw->mem_addr[i] = NULL;
-                }
-        }
-}
 /**
  * mei_txe_probe - Device Initialization Routine
  *
@@ -75,22 +64,22 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         struct mei_device *dev;
         struct mei_txe_hw *hw;
+        const int mask = BIT(SEC_BAR) | BIT(BRIDGE_BAR);
         int err;
-        int i;
 
         /* enable pci dev */
-        err = pci_enable_device(pdev);
+        err = pcim_enable_device(pdev);
         if (err) {
                 dev_err(&pdev->dev, "failed to enable pci device.\n");
                 goto end;
         }
         /* set PCI host mastering  */
         pci_set_master(pdev);
-        /* pci request regions for mei driver */
-        err = pci_request_regions(pdev, KBUILD_MODNAME);
+        /* pci request regions and mapping IO device memory for mei driver */
+        err = pcim_iomap_regions(pdev, mask, KBUILD_MODNAME);
         if (err) {
                 dev_err(&pdev->dev, "failed to get pci regions.\n");
-                goto disable_device;
+                goto end;
         }
 
         err = pci_set_dma_mask(pdev, DMA_BIT_MASK(36));
@@ -98,7 +87,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         dev_err(&pdev->dev, "No suitable DMA available.\n");
-                        goto release_regions;
+                        goto end;
                 }
         }
 
@@ -106,20 +95,10 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         dev = mei_txe_dev_init(pdev);
         if (!dev) {
                 err = -ENOMEM;
-                goto release_regions;
+                goto end;
         }
         hw = to_txe_hw(dev);
-
-        /* mapping  IO device memory */
-        for (i = SEC_BAR; i < NUM_OF_MEM_BARS; i++) {
-                hw->mem_addr[i] = pci_iomap(pdev, i, 0);
-                if (!hw->mem_addr[i]) {
-                        dev_err(&pdev->dev, "mapping I/O device memory failure.\n");
-                        err = -ENOMEM;
-                        goto free_device;
-                }
-        }
-
+        hw->mem_addr = pcim_iomap_table(pdev);
 
         pci_enable_msi(pdev);
 
@@ -140,7 +119,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (err) {
                 dev_err(&pdev->dev, "mei: request_threaded_irq failure. irq = %d\n",
                         pdev->irq);
-                goto free_device;
+                goto end;
         }
 
         if (mei_start(dev)) {
@@ -173,23 +152,9 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 stop:
         mei_stop(dev);
 release_irq:
-
         mei_cancel_work(dev);
-
-        /* disable interrupts */
         mei_disable_interrupts(dev);
-
         free_irq(pdev->irq, dev);
-        pci_disable_msi(pdev);
-
-free_device:
-        mei_txe_pci_iounmap(pdev, hw);
-
-        kfree(dev);
-release_regions:
-        pci_release_regions(pdev);
-disable_device:
-        pci_disable_device(pdev);
 end:
         dev_err(&pdev->dev, "initialization failed.\n");
         return err;
@@ -206,38 +171,24 @@ end:
 static void mei_txe_remove(struct pci_dev *pdev)
 {
         struct mei_device *dev;
-        struct mei_txe_hw *hw;
 
         dev = pci_get_drvdata(pdev);
         if (!dev) {
-                dev_err(&pdev->dev, "mei: dev =NULL\n");
+                dev_err(&pdev->dev, "mei: dev == NULL\n");
                 return;
         }
 
         pm_runtime_get_noresume(&pdev->dev);
 
-        hw = to_txe_hw(dev);
-
         mei_stop(dev);
 
         if (!pci_dev_run_wake(pdev))
                 mei_txe_unset_pm_domain(dev);
 
-        /* disable interrupts */
         mei_disable_interrupts(dev);
         free_irq(pdev->irq, dev);
-        pci_disable_msi(pdev);
-
-        pci_set_drvdata(pdev, NULL);
-
-        mei_txe_pci_iounmap(pdev, hw);
 
         mei_deregister(dev);
-
-        kfree(dev);
-
-        pci_release_regions(pdev);
-        pci_disable_device(pdev);
 }