| Message ID | 20220623113314.29761-4-johan+linaro@kernel.org |
|---|---|
| State | Accepted |
| Commit | 5d5b7d509ff85675779caeafcffa8086d7094339 |
| 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: > > Clean up the pipe clock handling by using dev_err_probe() to handle > probe deferral and dropping the obsolete comment that claimed that the > pipe clock was optional for some other PHY types. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- > drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c > index aebe5ed4e4e3..40e87f75ec4a 100644 > --- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c > +++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c > @@ -2530,22 +2530,11 @@ int qcom_qmp_phy_usb_create(struct device *dev, struct device_node *np, int id, > 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)) { > - 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; > + return dev_err_probe(dev, PTR_ERR(qphy->pipe_clk), > + "failed to get lane%d pipe clock\n", id); > } And here too. Afterwards: Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > generic_phy = devm_phy_create(dev, np, &qcom_qmp_phy_usb_ops); > -- > 2.35.1 >
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c index aebe5ed4e4e3..40e87f75ec4a 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c @@ -2530,22 +2530,11 @@ int qcom_qmp_phy_usb_create(struct device *dev, struct device_node *np, int id, 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)) { - 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; + return dev_err_probe(dev, PTR_ERR(qphy->pipe_clk), + "failed to get lane%d pipe clock\n", id); } generic_phy = devm_phy_create(dev, np, &qcom_qmp_phy_usb_ops);
Clean up the pipe clock handling by using dev_err_probe() to handle probe deferral and dropping the obsolete comment that claimed that the pipe clock was optional for some other PHY types. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)