| Message ID | 20240123184913.725435-4-afd@ti.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [1/8] remoteproc: k3-dsp: Use devm_rproc_alloc() helper | expand |
Hi Andrew, On Tue, Jan 23, 2024 at 12:49:09PM -0600, Andrew Davis wrote: > Use the device lifecycle managed TI-SCI get() function. This helps prevent > mistakes like not put()'ing in the wrong order in cleanup functions and > forgetting to put() on error paths. > > Signed-off-by: Andrew Davis <afd@ti.com> > --- > drivers/remoteproc/ti_k3_dsp_remoteproc.c | 33 +++++++---------------- > 1 file changed, 9 insertions(+), 24 deletions(-) > > diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c > index a13552c71f440..0240340a83e90 100644 > --- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c > +++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c > @@ -682,7 +682,6 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev) > const char *fw_name; > bool p_state = false; > int ret = 0; > - int ret1; > This patch is giving me a compilation error because @ret1 is still used in "release_tsp:". The 3rd hunk in the next patch is showing the problem. The goto statement is removed in the 6th patch. I have applied the first 3 patches of this set so no need to resend them with the next revision. And please add a cover letter next time. Thanks, Mathieu > data = of_device_get_match_data(dev); > if (!data) > @@ -708,30 +707,24 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev) > kproc->dev = dev; > kproc->data = data; > > - kproc->ti_sci = ti_sci_get_by_phandle(np, "ti,sci"); > + kproc->ti_sci = devm_ti_sci_get_by_phandle(dev, "ti,sci"); > if (IS_ERR(kproc->ti_sci)) > return dev_err_probe(dev, PTR_ERR(kproc->ti_sci), > "failed to get ti-sci handle\n"); > > ret = of_property_read_u32(np, "ti,sci-dev-id", &kproc->ti_sci_id); > - if (ret) { > - dev_err_probe(dev, ret, "missing 'ti,sci-dev-id' property\n"); > - goto put_sci; > - } > + if (ret) > + return dev_err_probe(dev, ret, "missing 'ti,sci-dev-id' property\n"); > > kproc->reset = devm_reset_control_get_exclusive(dev, NULL); > - if (IS_ERR(kproc->reset)) { > - ret = dev_err_probe(dev, PTR_ERR(kproc->reset), > - "failed to get reset\n"); > - goto put_sci; > - } > + if (IS_ERR(kproc->reset)) > + return dev_err_probe(dev, PTR_ERR(kproc->reset), > + "failed to get reset\n"); > > kproc->tsp = k3_dsp_rproc_of_get_tsp(dev, kproc->ti_sci); > - if (IS_ERR(kproc->tsp)) { > - ret = dev_err_probe(dev, PTR_ERR(kproc->tsp), > - "failed to construct ti-sci proc control\n"); > - goto put_sci; > - } > + if (IS_ERR(kproc->tsp)) > + return dev_err_probe(dev, PTR_ERR(kproc->tsp), > + "failed to construct ti-sci proc control\n"); > > ret = ti_sci_proc_request(kproc->tsp); > if (ret < 0) { > @@ -805,10 +798,6 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev) > dev_err(dev, "failed to release proc (%pe)\n", ERR_PTR(ret1)); > free_tsp: > kfree(kproc->tsp); > -put_sci: > - ret1 = ti_sci_put_handle(kproc->ti_sci); > - if (ret1) > - dev_err(dev, "failed to put ti_sci handle (%pe)\n", ERR_PTR(ret1)); > return ret; > } > > @@ -836,10 +825,6 @@ static void k3_dsp_rproc_remove(struct platform_device *pdev) > > kfree(kproc->tsp); > > - ret = ti_sci_put_handle(kproc->ti_sci); > - if (ret) > - dev_err(dev, "failed to put ti_sci handle (%pe)\n", ERR_PTR(ret)); > - > k3_dsp_reserved_mem_exit(kproc); > } > > -- > 2.39.2 >
diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc/ti_k3_dsp_remoteproc.c index a13552c71f440..0240340a83e90 100644 --- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c +++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c @@ -682,7 +682,6 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev) const char *fw_name; bool p_state = false; int ret = 0; - int ret1; data = of_device_get_match_data(dev); if (!data) @@ -708,30 +707,24 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev) kproc->dev = dev; kproc->data = data; - kproc->ti_sci = ti_sci_get_by_phandle(np, "ti,sci"); + kproc->ti_sci = devm_ti_sci_get_by_phandle(dev, "ti,sci"); if (IS_ERR(kproc->ti_sci)) return dev_err_probe(dev, PTR_ERR(kproc->ti_sci), "failed to get ti-sci handle\n"); ret = of_property_read_u32(np, "ti,sci-dev-id", &kproc->ti_sci_id); - if (ret) { - dev_err_probe(dev, ret, "missing 'ti,sci-dev-id' property\n"); - goto put_sci; - } + if (ret) + return dev_err_probe(dev, ret, "missing 'ti,sci-dev-id' property\n"); kproc->reset = devm_reset_control_get_exclusive(dev, NULL); - if (IS_ERR(kproc->reset)) { - ret = dev_err_probe(dev, PTR_ERR(kproc->reset), - "failed to get reset\n"); - goto put_sci; - } + if (IS_ERR(kproc->reset)) + return dev_err_probe(dev, PTR_ERR(kproc->reset), + "failed to get reset\n"); kproc->tsp = k3_dsp_rproc_of_get_tsp(dev, kproc->ti_sci); - if (IS_ERR(kproc->tsp)) { - ret = dev_err_probe(dev, PTR_ERR(kproc->tsp), - "failed to construct ti-sci proc control\n"); - goto put_sci; - } + if (IS_ERR(kproc->tsp)) + return dev_err_probe(dev, PTR_ERR(kproc->tsp), + "failed to construct ti-sci proc control\n"); ret = ti_sci_proc_request(kproc->tsp); if (ret < 0) { @@ -805,10 +798,6 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev) dev_err(dev, "failed to release proc (%pe)\n", ERR_PTR(ret1)); free_tsp: kfree(kproc->tsp); -put_sci: - ret1 = ti_sci_put_handle(kproc->ti_sci); - if (ret1) - dev_err(dev, "failed to put ti_sci handle (%pe)\n", ERR_PTR(ret1)); return ret; } @@ -836,10 +825,6 @@ static void k3_dsp_rproc_remove(struct platform_device *pdev) kfree(kproc->tsp); - ret = ti_sci_put_handle(kproc->ti_sci); - if (ret) - dev_err(dev, "failed to put ti_sci handle (%pe)\n", ERR_PTR(ret)); - k3_dsp_reserved_mem_exit(kproc); }
Use the device lifecycle managed TI-SCI get() function. This helps prevent mistakes like not put()'ing in the wrong order in cleanup functions and forgetting to put() on error paths. Signed-off-by: Andrew Davis <afd@ti.com> --- drivers/remoteproc/ti_k3_dsp_remoteproc.c | 33 +++++++---------------- 1 file changed, 9 insertions(+), 24 deletions(-)