* [PATCH 0/3] phy: qcom-qmp: pipe clock cleanups
@ 2022-06-23 11:33 Johan Hovold
2022-06-23 11:33 ` [PATCH 1/3] phy: qcom-qmp-pcie: drop obsolete pipe clock type check Johan Hovold
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Johan Hovold @ 2022-06-23 11:33 UTC (permalink / raw)
To: Vinod Koul
Cc: Andy Gross, Bjorn Andersson, Kishon Vijay Abraham I,
Dmitry Baryshkov, linux-arm-msm, linux-phy, linux-kernel,
Johan Hovold
Here are some follow-up cleanups after the recent driver split.
Johan
Johan Hovold (3):
phy: qcom-qmp-pcie: drop obsolete pipe clock type check
phy: qcom-qmp-pcie-msm8996: drop obsolete pipe clock type check
phy: qcom-qmp-usb: clean up pipe clock handling
.../phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 19 ++-----------------
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 19 ++-----------------
drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 15 ++-------------
3 files changed, 6 insertions(+), 47 deletions(-)
--
2.35.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/3] phy: qcom-qmp-pcie: drop obsolete pipe clock type check
2022-06-23 11:33 [PATCH 0/3] phy: qcom-qmp: pipe clock cleanups Johan Hovold
@ 2022-06-23 11:33 ` Johan Hovold
2022-06-23 11:44 ` Dmitry Baryshkov
2022-06-23 11:33 ` [PATCH 2/3] phy: qcom-qmp-pcie-msm8996: " Johan Hovold
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Johan Hovold @ 2022-06-23 11:33 UTC (permalink / raw)
To: Vinod Koul
Cc: Andy Gross, Bjorn Andersson, Kishon Vijay Abraham I,
Dmitry Baryshkov, linux-arm-msm, linux-phy, linux-kernel,
Johan Hovold
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>
---
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
index b2cd0cf965d8..385ea3d8de08 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
@@ -2210,26 +2210,11 @@ int qcom_qmp_phy_pcie_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)) {
- 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);
}
generic_phy = devm_phy_create(dev, np, &qcom_qmp_phy_pcie_ops);
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/3] phy: qcom-qmp-pcie-msm8996: drop obsolete pipe clock type check
2022-06-23 11:33 [PATCH 0/3] phy: qcom-qmp: pipe clock cleanups Johan Hovold
2022-06-23 11:33 ` [PATCH 1/3] phy: qcom-qmp-pcie: drop obsolete pipe clock type check Johan Hovold
@ 2022-06-23 11:33 ` Johan Hovold
2022-06-23 11:45 ` Dmitry Baryshkov
2022-06-23 11:33 ` [PATCH 3/3] phy: qcom-qmp-usb: clean up pipe clock handling Johan Hovold
2022-07-05 7:03 ` [PATCH 0/3] phy: qcom-qmp: pipe clock cleanups Vinod Koul
3 siblings, 1 reply; 9+ messages in thread
From: Johan Hovold @ 2022-06-23 11:33 UTC (permalink / raw)
To: Vinod Koul
Cc: Andy Gross, Bjorn Andersson, Kishon Vijay Abraham I,
Dmitry Baryshkov, linux-arm-msm, linux-phy, linux-kernel,
Johan Hovold
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);
}
/* Get lane reset, if any */
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/3] phy: qcom-qmp-usb: clean up pipe clock handling
2022-06-23 11:33 [PATCH 0/3] phy: qcom-qmp: pipe clock cleanups Johan Hovold
2022-06-23 11:33 ` [PATCH 1/3] phy: qcom-qmp-pcie: drop obsolete pipe clock type check Johan Hovold
2022-06-23 11:33 ` [PATCH 2/3] phy: qcom-qmp-pcie-msm8996: " Johan Hovold
@ 2022-06-23 11:33 ` Johan Hovold
2022-06-23 11:45 ` Dmitry Baryshkov
2022-07-05 7:03 ` [PATCH 0/3] phy: qcom-qmp: pipe clock cleanups Vinod Koul
3 siblings, 1 reply; 9+ messages in thread
From: Johan Hovold @ 2022-06-23 11:33 UTC (permalink / raw)
To: Vinod Koul
Cc: Andy Gross, Bjorn Andersson, Kishon Vijay Abraham I,
Dmitry Baryshkov, linux-arm-msm, linux-phy, linux-kernel,
Johan Hovold
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);
}
generic_phy = devm_phy_create(dev, np, &qcom_qmp_phy_usb_ops);
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] phy: qcom-qmp-pcie: drop obsolete pipe clock type check
2022-06-23 11:33 ` [PATCH 1/3] phy: qcom-qmp-pcie: drop obsolete pipe clock type check Johan Hovold
@ 2022-06-23 11:44 ` Dmitry Baryshkov
2022-06-23 11:51 ` Johan Hovold
0 siblings, 1 reply; 9+ messages in thread
From: Dmitry Baryshkov @ 2022-06-23 11:44 UTC (permalink / raw)
To: Johan Hovold
Cc: Vinod Koul, Andy Gross, Bjorn Andersson, Kishon Vijay Abraham I,
linux-arm-msm, linux-phy, linux-kernel
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>
> ---
> drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 19 ++-----------------
> 1 file changed, 2 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
> index b2cd0cf965d8..385ea3d8de08 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
> @@ -2210,26 +2210,11 @@ int qcom_qmp_phy_pcie_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)) {
> - 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);
> }
Please remove the brackets around a single statement. With that fixed:
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>
> generic_phy = devm_phy_create(dev, np, &qcom_qmp_phy_pcie_ops);
> --
> 2.35.1
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/3] phy: qcom-qmp-pcie-msm8996: drop obsolete pipe clock type check
2022-06-23 11:33 ` [PATCH 2/3] phy: qcom-qmp-pcie-msm8996: " Johan Hovold
@ 2022-06-23 11:45 ` Dmitry Baryshkov
0 siblings, 0 replies; 9+ messages in thread
From: Dmitry Baryshkov @ 2022-06-23 11:45 UTC (permalink / raw)
To: Johan Hovold
Cc: Vinod Koul, Andy Gross, Bjorn Andersson, Kishon Vijay Abraham I,
linux-arm-msm, linux-phy, linux-kernel
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
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/3] phy: qcom-qmp-usb: clean up pipe clock handling
2022-06-23 11:33 ` [PATCH 3/3] phy: qcom-qmp-usb: clean up pipe clock handling Johan Hovold
@ 2022-06-23 11:45 ` Dmitry Baryshkov
0 siblings, 0 replies; 9+ messages in thread
From: Dmitry Baryshkov @ 2022-06-23 11:45 UTC (permalink / raw)
To: Johan Hovold
Cc: Vinod Koul, Andy Gross, Bjorn Andersson, Kishon Vijay Abraham I,
linux-arm-msm, linux-phy, linux-kernel
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
>
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/3] phy: qcom-qmp-pcie: drop obsolete pipe clock type check
2022-06-23 11:44 ` Dmitry Baryshkov
@ 2022-06-23 11:51 ` Johan Hovold
0 siblings, 0 replies; 9+ messages in thread
From: Johan Hovold @ 2022-06-23 11:51 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Johan Hovold, Vinod Koul, Andy Gross, Bjorn Andersson,
Kishon Vijay Abraham I, linux-arm-msm, linux-phy, linux-kernel
On Thu, Jun 23, 2022 at 02:44:28PM +0300, Dmitry Baryshkov wrote:
> 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>
> > ---
> > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
> > 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);
> > }
>
> Please remove the brackets around a single statement.
For readability reasons I prefer keeping brackets around statements
spanning multiple lines instead of relying on indentation.
Johan
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/3] phy: qcom-qmp: pipe clock cleanups
2022-06-23 11:33 [PATCH 0/3] phy: qcom-qmp: pipe clock cleanups Johan Hovold
` (2 preceding siblings ...)
2022-06-23 11:33 ` [PATCH 3/3] phy: qcom-qmp-usb: clean up pipe clock handling Johan Hovold
@ 2022-07-05 7:03 ` Vinod Koul
3 siblings, 0 replies; 9+ messages in thread
From: Vinod Koul @ 2022-07-05 7:03 UTC (permalink / raw)
To: Johan Hovold
Cc: Andy Gross, Bjorn Andersson, Kishon Vijay Abraham I,
Dmitry Baryshkov, linux-arm-msm, linux-phy, linux-kernel
On 23-06-22, 13:33, Johan Hovold wrote:
> Here are some follow-up cleanups after the recent driver split.
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-07-05 7:03 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-23 11:33 [PATCH 0/3] phy: qcom-qmp: pipe clock cleanups Johan Hovold
2022-06-23 11:33 ` [PATCH 1/3] phy: qcom-qmp-pcie: drop obsolete pipe clock type check Johan Hovold
2022-06-23 11:44 ` Dmitry Baryshkov
2022-06-23 11:51 ` Johan Hovold
2022-06-23 11:33 ` [PATCH 2/3] phy: qcom-qmp-pcie-msm8996: " Johan Hovold
2022-06-23 11:45 ` Dmitry Baryshkov
2022-06-23 11:33 ` [PATCH 3/3] phy: qcom-qmp-usb: clean up pipe clock handling Johan Hovold
2022-06-23 11:45 ` Dmitry Baryshkov
2022-07-05 7:03 ` [PATCH 0/3] phy: qcom-qmp: pipe clock cleanups Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).