[PATCH v2 0/2] PCI: qcom: Drop unused post_deinit callback

[PATCH v2 0/2] PCI: qcom: Drop unused post_deinit callback

[Johan Hovold]

This series drops the badly named post_deinit callback which is unused
after merging the PIPE clock series:

	https://lore.kernel.org/all/20220608105238.2973600-1-dmitry.baryshkov@linaro.org/

Included is also a related error-label cleanup.

It seems the above series will need to be rebased on the recently posted
DBI fixes, and then these can go on top.

Note that these patches also depend on the patch adding support for
modular builds which should be ready to be merged:

	https://lore.kernel.org/all/20220519094646.23009-1-johan+linaro@kernel.org/

Johan


Changes in v2
 - keep the post_init() callback which is being repurposed for DBI
   accesses

Johan Hovold (2):
  PCI: qcom: Drop unused post_deinit callback
  PCI: qcom: Rename host-init error label

 drivers/pci/controller/dwc/pcie-qcom.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

-- 
2.35.1

[PATCH v2 1/2] PCI: qcom: Drop unused post_deinit callback

[Johan Hovold]

Drop the unused and confusingly named post_deinit callback that was
added for the now removed pipe clock handling.

If ever needed we can add back a callback named pre_deinit (or perhaps
rather pre_phy_power_off) instead.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/pci/controller/dwc/pcie-qcom.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
index 093f4d4bc15d..c5e60f8c565d 100644
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@ -182,7 +182,6 @@ struct qcom_pcie_ops {
 	int (*init)(struct qcom_pcie *pcie);
 	int (*post_init)(struct qcom_pcie *pcie);
 	void (*deinit)(struct qcom_pcie *pcie);
-	void (*post_deinit)(struct qcom_pcie *pcie);
 	void (*ltssm_enable)(struct qcom_pcie *pcie);
 	int (*config_sid)(struct qcom_pcie *pcie);
 };
@@ -1353,8 +1352,6 @@ static int qcom_pcie_host_init(struct pcie_port *pp)
 
 err:
 	qcom_ep_reset_assert(pcie);
-	if (pcie->cfg->ops->post_deinit)
-		pcie->cfg->ops->post_deinit(pcie);
 err_disable_phy:
 	phy_power_off(pcie->phy);
 err_deinit:
@@ -1366,8 +1363,6 @@ static int qcom_pcie_host_init(struct pcie_port *pp)
 static void qcom_pcie_host_deinit(struct qcom_pcie *pcie)
 {
 	qcom_ep_reset_assert(pcie);
-	if (pcie->cfg->ops->post_deinit)
-		pcie->cfg->ops->post_deinit(pcie);
 	phy_power_off(pcie->phy);
 	pcie->cfg->ops->deinit(pcie);
 }
-- 
2.35.1

[PATCH v2 2/2] PCI: qcom: Rename host-init error label

[Johan Hovold]

Use a more descriptive name for the reset host-init error label for
consistency.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/pci/controller/dwc/pcie-qcom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
index c5e60f8c565d..7a5d15b2cff8 100644
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@ -1345,12 +1345,12 @@ static int qcom_pcie_host_init(struct pcie_port *pp)
 	if (pcie->cfg->ops->config_sid) {
 		ret = pcie->cfg->ops->config_sid(pcie);
 		if (ret)
-			goto err;
+			goto err_assert_reset;
 	}
 
 	return 0;
 
-err:
+err_assert_reset:
 	qcom_ep_reset_assert(pcie);
 err_disable_phy:
 	phy_power_off(pcie->phy);
-- 
2.35.1