This series drops the badly named post_deinit callback which is unused
after merging the PIPE clock series. Included is also a related
error-label cleanup.
Since the modular driver patch is held off for a while still, I've
rebased these cleanups so that they might make it into 6.1.
Johan
Changes in v3
- drop dependency on patch making the driver modular
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 | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
--
2.35.1
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 <[email protected]>
---
drivers/pci/controller/dwc/pcie-qcom.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c
index 39ca06ffe614..8d6df0db4ebb 100644
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@ -208,7 +208,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);
};
@@ -1520,8 +1519,6 @@ static int qcom_pcie_host_init(struct dw_pcie_rp *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:
--
2.35.1
On Wed, 28 Sep 2022 17:54:19 +0200, Johan Hovold wrote:
> This series drops the badly named post_deinit callback which is unused
> after merging the PIPE clock series. Included is also a related
> error-label cleanup.
>
> Since the modular driver patch is held off for a while still, I've
> rebased these cleanups so that they might make it into 6.1.
>
> [...]
Applied to pci/qcom, thanks!
[1/2] PCI: qcom: Drop unused post_deinit callback
https://git.kernel.org/lpieralisi/pci/c/b623023225ab
[2/2] PCI: qcom: Rename host-init error label
https://git.kernel.org/lpieralisi/pci/c/0e4d9a5cc767
Thanks,
Lorenzo