| Message ID | 20220920073826.20811-6-johan+linaro@kernel.org |
|---|---|
| State | Accepted |
| Commit | 91174e2c52ea9b5069ee04cffbdfa14837a5b761 |
| Headers | show |
| Series | phy: qcom-qmp: config and misc clean ups | expand |
On 20/09/2022 09:38, Johan Hovold wrote: > Drop the unnecessary PHY init and exit callback wrappers. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- > drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 29 ++++-------------------- > 1 file changed, 4 insertions(+), 25 deletions(-) > > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c > index d25f9215b86f..525097e3b041 100644 > --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c > +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c > @@ -1877,8 +1877,9 @@ static int qmp_pcie_serdes_init(struct qmp_phy *qphy) > return 0; > } > > -static int qmp_pcie_com_init(struct qmp_phy *qphy) > +static int qmp_pcie_init(struct phy *phy) > { > + struct qmp_phy *qphy = phy_get_drvdata(phy); > struct qcom_qmp *qmp = qphy->qmp; > const struct qmp_phy_cfg *cfg = qphy->cfg; > void __iomem *pcs = qphy->pcs; > @@ -1925,8 +1926,9 @@ static int qmp_pcie_com_init(struct qmp_phy *qphy) > return ret; > } > > -static int qmp_pcie_com_exit(struct qmp_phy *qphy) > +static int qmp_pcie_exit(struct phy *phy) > { > + struct qmp_phy *qphy = phy_get_drvdata(phy); > struct qcom_qmp *qmp = qphy->qmp; > const struct qmp_phy_cfg *cfg = qphy->cfg; > > @@ -1939,20 +1941,6 @@ static int qmp_pcie_com_exit(struct qmp_phy *qphy) > return 0; > } > > -static int qmp_pcie_init(struct phy *phy) > -{ > - struct qmp_phy *qphy = phy_get_drvdata(phy); > - struct qcom_qmp *qmp = qphy->qmp; > - int ret; > - dev_vdbg(qmp->dev, "Initializing QMP phy\n"); > - > - ret = qmp_pcie_com_init(qphy); > - if (ret) > - return ret; > - > - return 0; > -} > - > static int qmp_pcie_power_on(struct phy *phy) > { > struct qmp_phy *qphy = phy_get_drvdata(phy); > @@ -2060,15 +2048,6 @@ static int qmp_pcie_power_off(struct phy *phy) > return 0; > } > > -static int qmp_pcie_exit(struct phy *phy) > -{ > - struct qmp_phy *qphy = phy_get_drvdata(phy); > - > - qmp_pcie_com_exit(qphy); > - > - return 0; > -} > - > static int qmp_pcie_enable(struct phy *phy) > { > int ret; Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
On 20/09/2022 10:38, Johan Hovold wrote: > Drop the unnecessary PHY init and exit callback wrappers. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- > drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 29 ++++-------------------- > 1 file changed, 4 insertions(+), 25 deletions(-) > Initially I thought that it might be possible to unify the com_init/com_exit functions, however it doesn't seem really possible. Let's clean this up. Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c index d25f9215b86f..525097e3b041 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c @@ -1877,8 +1877,9 @@ static int qmp_pcie_serdes_init(struct qmp_phy *qphy) return 0; } -static int qmp_pcie_com_init(struct qmp_phy *qphy) +static int qmp_pcie_init(struct phy *phy) { + struct qmp_phy *qphy = phy_get_drvdata(phy); struct qcom_qmp *qmp = qphy->qmp; const struct qmp_phy_cfg *cfg = qphy->cfg; void __iomem *pcs = qphy->pcs; @@ -1925,8 +1926,9 @@ static int qmp_pcie_com_init(struct qmp_phy *qphy) return ret; } -static int qmp_pcie_com_exit(struct qmp_phy *qphy) +static int qmp_pcie_exit(struct phy *phy) { + struct qmp_phy *qphy = phy_get_drvdata(phy); struct qcom_qmp *qmp = qphy->qmp; const struct qmp_phy_cfg *cfg = qphy->cfg; @@ -1939,20 +1941,6 @@ static int qmp_pcie_com_exit(struct qmp_phy *qphy) return 0; } -static int qmp_pcie_init(struct phy *phy) -{ - struct qmp_phy *qphy = phy_get_drvdata(phy); - struct qcom_qmp *qmp = qphy->qmp; - int ret; - dev_vdbg(qmp->dev, "Initializing QMP phy\n"); - - ret = qmp_pcie_com_init(qphy); - if (ret) - return ret; - - return 0; -} - static int qmp_pcie_power_on(struct phy *phy) { struct qmp_phy *qphy = phy_get_drvdata(phy); @@ -2060,15 +2048,6 @@ static int qmp_pcie_power_off(struct phy *phy) return 0; } -static int qmp_pcie_exit(struct phy *phy) -{ - struct qmp_phy *qphy = phy_get_drvdata(phy); - - qmp_pcie_com_exit(qphy); - - return 0; -} - static int qmp_pcie_enable(struct phy *phy) { int ret;
Drop the unnecessary PHY init and exit callback wrappers. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 29 ++++-------------------- 1 file changed, 4 insertions(+), 25 deletions(-)