---
  drivers/misc/cxl/pci.c  |  3 ---
  drivers/misc/cxl/vphb.c | 16 ++--------------
  2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
index 9c5a21fee835..193ff22f610b 100644
--- a/drivers/misc/cxl/pci.c
+++ b/drivers/misc/cxl/pci.c

@@ -1886,9 +1886,6 @@ static int cxl_probe(struct pci_dev *dev, const struct pci_device_id *id)
  			dev_err(&dev->dev, "AFU %i failed to start: %i\n", slice, rc);
  	}
  
-	if (pnv_pci_on_cxl_phb(dev) && adapter->slices >= 1)
-		pnv_cxl_phb_set_peer_afu(dev, adapter->afu[0]);
-
  	return 0;
  }
  

diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c
index 7fd0bdc1436a..1a99c9c7a6fb 100644
--- a/drivers/misc/cxl/vphb.c
+++ b/drivers/misc/cxl/vphb.c

@@ -9,7 +9,6 @@
  
  #include <linux/pci.h>
  #include <misc/cxl.h>
-#include <asm/pnv-pci.h>
  #include "cxl.h"
  
  static int cxl_dma_set_mask(struct pci_dev *pdev, u64 dma_mask)

@@ -284,18 +283,13 @@ void cxl_pci_vphb_remove(struct cxl_afu *afu)
  	 */
  }
  
-static bool _cxl_pci_is_vphb_device(struct pci_controller *phb)
-{
-	return (phb->ops == &cxl_pcie_pci_ops);
-}
-
  bool cxl_pci_is_vphb_device(struct pci_dev *dev)
  {
  	struct pci_controller *phb;
  
  	phb = pci_bus_to_host(dev->bus);
  
-	return _cxl_pci_is_vphb_device(phb);
+	return (phb->ops == &cxl_pcie_pci_ops);
  }
  
  struct cxl_afu *cxl_pci_to_afu(struct pci_dev *dev)

@@ -304,13 +298,7 @@ struct cxl_afu *cxl_pci_to_afu(struct pci_dev *dev)
  
  	phb = pci_bus_to_host(dev->bus);
  
-	if (_cxl_pci_is_vphb_device(phb))
-		return (struct cxl_afu *)phb->private_data;
-
-	if (pnv_pci_on_cxl_phb(dev))
-		return pnv_cxl_phb_to_afu(phb);
-
-	return ERR_PTR(-ENODEV);
+	return (struct cxl_afu *)phb->private_data;
  }
  EXPORT_SYMBOL_GPL(cxl_pci_to_afu);