From 89d2d76a29f9c0288134cb22b55dcbfb2b1f62cc Mon Sep 17 00:00:00 2001 From: Hemant Kumar Date: Mon, 8 Mar 2021 18:40:50 -0800 Subject: [PATCH] pci: msm: Get rid of msm pcie device table Since pcidev_table is no longer used in the driver get rid of the table entry from msm pcie device structure. Also remove unused structure members from msm_pcie_device_info. Since device table is removed, rename msm_pcie_config_device_table to msm_pcie_config_device_info. Change-Id: I5359cc0f85d6b7f9f069f7decc3bc67105543abb Signed-off-by: Hemant Kumar --- drivers/pci/controller/pci-msm.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/pci/controller/pci-msm.c b/drivers/pci/controller/pci-msm.c index b238ec4ed87c..18dd212e44e1 100644 --- a/drivers/pci/controller/pci-msm.c +++ b/drivers/pci/controller/pci-msm.c @@ -638,11 +638,7 @@ struct msm_pcie_sid_info_t { /* PCIe device info structure */ struct msm_pcie_device_info { struct list_head pcidev_node; - u32 bdf; struct pci_dev *dev; - short short_bdf; - u32 sid; - int domain; }; /* DRV IPC command type */ @@ -874,7 +870,6 @@ struct msm_pcie_dev_t { struct pinctrl *pinctrl; struct pinctrl_state *pins_default; struct pinctrl_state *pins_sleep; - struct msm_pcie_device_info pcidev_table[MAX_DEVICE_NUM]; struct msm_pcie_drv_info *drv_info; struct work_struct drv_enable_pc_work; @@ -4729,7 +4724,7 @@ static void msm_pcie_disable(struct msm_pcie_dev_t *dev) PCIE_DBG(dev, "RC%d: exit\n", dev->rc_idx); } -static int msm_pcie_config_device_table(struct pci_dev *pcidev, void *pdev) +static int msm_pcie_config_device_info(struct pci_dev *pcidev, void *pdev) { struct msm_pcie_dev_t *pcie_dev = (struct msm_pcie_dev_t *) pdev; struct msm_pcie_device_info *dev_info; @@ -4963,7 +4958,7 @@ int msm_pcie_enumerate(u32 rc_idx) goto out; } - pci_walk_bus(dev->dev->bus, msm_pcie_config_device_table, dev); + pci_walk_bus(dev->dev->bus, msm_pcie_config_device_info, dev); pci_save_state(pcidev); dev->default_state = pci_store_saved_state(pcidev); @@ -5908,7 +5903,7 @@ static int msm_pcie_probe(struct platform_device *pdev) { int ret = 0; int rc_idx = -1; - int i, size; + int size; struct msm_pcie_dev_t *pcie_dev; struct device_node *of_node; @@ -6136,13 +6131,6 @@ static int msm_pcie_probe(struct platform_device *pdev) memcpy(pcie_dev->pipe_reset, msm_pcie_pipe_reset_info[rc_idx], sizeof(msm_pcie_pipe_reset_info[rc_idx])); - for (i = 0; i < MAX_DEVICE_NUM; i++) { - pcie_dev->pcidev_table[i].bdf = 0; - pcie_dev->pcidev_table[i].dev = NULL; - pcie_dev->pcidev_table[i].short_bdf = 0; - pcie_dev->pcidev_table[i].sid = 0; - } - dev_set_drvdata(&pdev->dev, pcie_dev); ret = msm_pcie_get_resources(pcie_dev, pcie_dev->pdev);