| Message ID | 20220623113314.29761-3-johan+linaro@kernel.org |
|---|---|
| State | Accepted |
| Commit | 36db6ce1e47cf85772a4f6199f8f14c1fad672ce |
| Headers | show |
| Series | phy: qcom-qmp: pipe clock cleanups | expand |
On Thu, 23 Jun 2022 at 14:33, Johan Hovold <johan+linaro@kernel.org> wrote: > > Drop the obsolete pipe clock handling which was used to treat the pipe > clock as optional for types other than PCIe and USB and which is no > longer needed since splitting the PHY driver. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- > .../phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 19 ++----------------- > 1 file changed, 2 insertions(+), 17 deletions(-) > > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c > index 48ea1de81d7c..812d14afb5ec 100644 > --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c > +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c > @@ -904,26 +904,11 @@ int qcom_qmp_phy_pcie_msm8996_create(struct device *dev, struct device_node *np, > if (!qphy->pcs_misc) > dev_vdbg(dev, "PHY pcs_misc-reg not used\n"); > > - /* > - * Get PHY's Pipe clock, if any. USB3 and PCIe are PIPE3 > - * based phys, so they essentially have pipe clock. So, > - * we return error in case phy is USB3 or PIPE type. > - * Otherwise, we initialize pipe clock to NULL for > - * all phys that don't need this. > - */ > snprintf(prop_name, sizeof(prop_name), "pipe%d", id); > qphy->pipe_clk = devm_get_clk_from_child(dev, np, prop_name); > if (IS_ERR(qphy->pipe_clk)) { > - if (cfg->type == PHY_TYPE_PCIE || > - cfg->type == PHY_TYPE_USB3) { > - ret = PTR_ERR(qphy->pipe_clk); > - if (ret != -EPROBE_DEFER) > - dev_err(dev, > - "failed to get lane%d pipe_clk, %d\n", > - id, ret); > - return ret; > - } > - qphy->pipe_clk = NULL; > + return dev_err_probe(dev, PTR_ERR(qphy->pipe_clk), > + "failed to get lane%d pipe clock\n", id); > } Same comment. Please remove brackets. With that fixed: Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > /* Get lane reset, if any */ > -- > 2.35.1 >
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c index 48ea1de81d7c..812d14afb5ec 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c @@ -904,26 +904,11 @@ int qcom_qmp_phy_pcie_msm8996_create(struct device *dev, struct device_node *np, if (!qphy->pcs_misc) dev_vdbg(dev, "PHY pcs_misc-reg not used\n"); - /* - * Get PHY's Pipe clock, if any. USB3 and PCIe are PIPE3 - * based phys, so they essentially have pipe clock. So, - * we return error in case phy is USB3 or PIPE type. - * Otherwise, we initialize pipe clock to NULL for - * all phys that don't need this. - */ snprintf(prop_name, sizeof(prop_name), "pipe%d", id); qphy->pipe_clk = devm_get_clk_from_child(dev, np, prop_name); if (IS_ERR(qphy->pipe_clk)) { - if (cfg->type == PHY_TYPE_PCIE || - cfg->type == PHY_TYPE_USB3) { - ret = PTR_ERR(qphy->pipe_clk); - if (ret != -EPROBE_DEFER) - dev_err(dev, - "failed to get lane%d pipe_clk, %d\n", - id, ret); - return ret; - } - qphy->pipe_clk = NULL; + return dev_err_probe(dev, PTR_ERR(qphy->pipe_clk), + "failed to get lane%d pipe clock\n", id); } /* Get lane reset, if any */
Drop the obsolete pipe clock handling which was used to treat the pipe clock as optional for types other than PCIe and USB and which is no longer needed since splitting the PHY driver. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- .../phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)