cxl/pci: Kill cxl_map_regs()

The component registers are currently unused by the cxl_pci driver.
Only the physical address base of the component registers is conveyed to
the cxl_mem driver. Just call cxl_map_device_registers() directly.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/166974410443.1608150.15855499736133349600.stgit@djiang5-desk3.ch.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
index faeb5d9d7a7ab3a753081872cbe1ec5c35b477be..82023cf0cdcf6234ce18dba1e6d45911ec5812ec 100644 (file)
--- a/drivers/cxl/pci.c
+++ b/drivers/cxl/pci.c
@@ -347,27 +347,6 @@ static int cxl_probe_regs(struct pci_dev *pdev, struct cxl_register_map *map)
        return 0;
 }
 
-static int cxl_map_regs(struct cxl_dev_state *cxlds, struct cxl_register_map *map)
-{
-       struct device *dev = cxlds->dev;
-       struct pci_dev *pdev = to_pci_dev(dev);
-
-       switch (map->reg_type) {
-       case CXL_REGLOC_RBI_COMPONENT:
-               cxl_map_component_regs(pdev, &cxlds->regs.component, map);
-               dev_dbg(dev, "Mapping component registers...\n");
-               break;
-       case CXL_REGLOC_RBI_MEMDEV:
-               cxl_map_device_regs(pdev, &cxlds->regs.device_regs, map);
-               dev_dbg(dev, "Probing device registers...\n");
-               break;
-       default:
-               break;
-       }
-
-       return 0;
-}
-
 static int cxl_setup_regs(struct pci_dev *pdev, enum cxl_regloc_type type,
                          struct cxl_register_map *map)
 {
@@ -461,7 +440,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        if (rc)
                return rc;
 
-       rc = cxl_map_regs(cxlds, &map);
+       rc = cxl_map_device_regs(pdev, &cxlds->regs.device_regs, &map);
        if (rc)
                return rc;