This change switches to managed resource APIs to allocated resources
such as irq, clock. Hence does away with release statements of the
same resorces in error lables and remove function.
Cc: Eduardo Valentin <[email protected]>
Cc: Zhang Rui <[email protected]>
Cc: [email protected]
Signed-off-by: Pramod Gurav <[email protected]>
---
Changes since v2:
- fix failure path of clk_get_rate by returning error.
Change since v1:
- Passing struct device to devm_clk_get was missing. Fix the same in v2.
drivers/thermal/ti-soc-thermal/ti-bandgap.c | 58 ++++++++-------------------
1 file changed, 16 insertions(+), 42 deletions(-)
diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
index 634b6ce..22ad68e 100644
--- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
@@ -1060,7 +1060,7 @@ static int ti_bandgap_tshut_init(struct ti_bandgap *bgp,
int status;
/* Request for gpio_86 line */
- status = gpio_request(gpio_nr, "tshut");
+ status = devm_gpio_request(&pdev->dev, gpio_nr, "tshut");
if (status < 0) {
dev_err(bgp->dev, "Could not request for TSHUT GPIO:%i\n", 86);
return status;
@@ -1071,14 +1071,13 @@ static int ti_bandgap_tshut_init(struct ti_bandgap *bgp,
return status;
}
- status = request_irq(gpio_to_irq(gpio_nr), ti_bandgap_tshut_irq_handler,
- IRQF_TRIGGER_RISING, "tshut", NULL);
- if (status) {
- gpio_free(gpio_nr);
+ status = devm_request_irq(&pdev->dev, gpio_to_irq(gpio_nr),
+ ti_bandgap_tshut_irq_handler,
+ IRQF_TRIGGER_RISING, "tshut", NULL);
+ if (status)
dev_err(bgp->dev, "request irq failed for TSHUT");
- }
- return 0;
+ return status;
}
/**
@@ -1104,16 +1103,14 @@ static int ti_bandgap_talert_init(struct ti_bandgap *bgp,
dev_err(&pdev->dev, "get_irq failed\n");
return bgp->irq;
}
- ret = request_threaded_irq(bgp->irq, NULL,
+ ret = devm_request_threaded_irq(&pdev->dev, bgp->irq, NULL,
ti_bandgap_talert_irq_handler,
IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
"talert", bgp);
- if (ret) {
+ if (ret)
dev_err(&pdev->dev, "Request threaded irq failed.\n");
- return ret;
- }
- return 0;
+ return ret;
}
static const struct of_device_id of_ti_bandgap_match[];
@@ -1212,21 +1209,17 @@ int ti_bandgap_probe(struct platform_device *pdev)
}
}
- bgp->fclock = clk_get(NULL, bgp->conf->fclock_name);
- ret = IS_ERR(bgp->fclock);
- if (ret) {
+ bgp->fclock = devm_clk_get(&pdev->dev, bgp->conf->fclock_name);
+ if (IS_ERR(bgp->fclock)) {
dev_err(&pdev->dev, "failed to request fclock reference\n");
- ret = PTR_ERR(bgp->fclock);
- goto free_irqs;
+ return PTR_ERR(bgp->fclock);
}
- bgp->div_clk = clk_get(NULL, bgp->conf->div_ck_name);
- ret = IS_ERR(bgp->div_clk);
- if (ret) {
+ bgp->div_clk = devm_clk_get(&pdev->dev, bgp->conf->div_ck_name);
+ if (IS_ERR(bgp->div_clk)) {
dev_err(&pdev->dev,
"failed to request div_ts_ck clock ref\n");
- ret = PTR_ERR(bgp->div_clk);
- goto free_irqs;
+ return PTR_ERR(bgp->div_clk);
}
for (i = 0; i < bgp->conf->sensor_count; i++) {
@@ -1249,9 +1242,8 @@ int ti_bandgap_probe(struct platform_device *pdev)
bgp->conf->sensors[0].ts_data->max_freq);
if (clk_rate < bgp->conf->sensors[0].ts_data->min_freq ||
clk_rate <= 0) {
- ret = -ENODEV;
dev_err(&pdev->dev, "wrong clock rate (%d)\n", clk_rate);
- goto put_clks;
+ return -ENODEV;
}
ret = clk_set_rate(bgp->div_clk, clk_rate);
@@ -1357,14 +1349,6 @@ remove_sensors:
disable_clk:
if (TI_BANDGAP_HAS(bgp, CLK_CTRL))
clk_disable_unprepare(bgp->fclock);
-put_clks:
- clk_put(bgp->fclock);
- clk_put(bgp->div_clk);
-free_irqs:
- if (TI_BANDGAP_HAS(bgp, TSHUT)) {
- free_irq(gpio_to_irq(bgp->tshut_gpio), NULL);
- gpio_free(bgp->tshut_gpio);
- }
return ret;
}
@@ -1388,16 +1372,6 @@ int ti_bandgap_remove(struct platform_device *pdev)
if (TI_BANDGAP_HAS(bgp, CLK_CTRL))
clk_disable_unprepare(bgp->fclock);
- clk_put(bgp->fclock);
- clk_put(bgp->div_clk);
-
- if (TI_BANDGAP_HAS(bgp, TALERT))
- free_irq(bgp->irq, bgp);
-
- if (TI_BANDGAP_HAS(bgp, TSHUT)) {
- free_irq(gpio_to_irq(bgp->tshut_gpio), NULL);
- gpio_free(bgp->tshut_gpio);
- }
return 0;
}
--
1.7.9.5
Hello Pramod,
On Fri, Oct 10, 2014 at 11:32:12AM +0530, Pramod Gurav wrote:
> This change switches to managed resource APIs to allocated resources
> such as irq, clock. Hence does away with release statements of the
> same resorces in error lables and remove function.
>
> Cc: Eduardo Valentin <[email protected]>
> Cc: Zhang Rui <[email protected]>
> Cc: [email protected]
> Signed-off-by: Pramod Gurav <[email protected]>
>
> ---
> Changes since v2:
> - fix failure path of clk_get_rate by returning error.
> Change since v1:
> - Passing struct device to devm_clk_get was missing. Fix the same in v2.
>
Thanks for updating your patch. Apologize for my late answer.
> drivers/thermal/ti-soc-thermal/ti-bandgap.c | 58 ++++++++-------------------
> 1 file changed, 16 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
> index 634b6ce..22ad68e 100644
> --- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
> +++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
> @@ -1060,7 +1060,7 @@ static int ti_bandgap_tshut_init(struct ti_bandgap *bgp,
> int status;
>
> /* Request for gpio_86 line */
> - status = gpio_request(gpio_nr, "tshut");
> + status = devm_gpio_request(&pdev->dev, gpio_nr, "tshut");
> if (status < 0) {
> dev_err(bgp->dev, "Could not request for TSHUT GPIO:%i\n", 86);
> return status;
> @@ -1071,14 +1071,13 @@ static int ti_bandgap_tshut_init(struct ti_bandgap *bgp,
> return status;
> }
>
> - status = request_irq(gpio_to_irq(gpio_nr), ti_bandgap_tshut_irq_handler,
> - IRQF_TRIGGER_RISING, "tshut", NULL);
> - if (status) {
> - gpio_free(gpio_nr);
> + status = devm_request_irq(&pdev->dev, gpio_to_irq(gpio_nr),
> + ti_bandgap_tshut_irq_handler,
> + IRQF_TRIGGER_RISING, "tshut", NULL);
> + if (status)
> dev_err(bgp->dev, "request irq failed for TSHUT");
> - }
>
> - return 0;
> + return status;
> }
>
> /**
> @@ -1104,16 +1103,14 @@ static int ti_bandgap_talert_init(struct ti_bandgap *bgp,
> dev_err(&pdev->dev, "get_irq failed\n");
> return bgp->irq;
> }
> - ret = request_threaded_irq(bgp->irq, NULL,
> + ret = devm_request_threaded_irq(&pdev->dev, bgp->irq, NULL,
> ti_bandgap_talert_irq_handler,
> IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
> "talert", bgp);
> - if (ret) {
> + if (ret)
> dev_err(&pdev->dev, "Request threaded irq failed.\n");
> - return ret;
> - }
>
> - return 0;
> + return ret;
> }
>
> static const struct of_device_id of_ti_bandgap_match[];
> @@ -1212,21 +1209,17 @@ int ti_bandgap_probe(struct platform_device *pdev)
> }
> }
>
> - bgp->fclock = clk_get(NULL, bgp->conf->fclock_name);
> - ret = IS_ERR(bgp->fclock);
> - if (ret) {
> + bgp->fclock = devm_clk_get(&pdev->dev, bgp->conf->fclock_name);
> + if (IS_ERR(bgp->fclock)) {
> dev_err(&pdev->dev, "failed to request fclock reference\n");
> - ret = PTR_ERR(bgp->fclock);
> - goto free_irqs;
> + return PTR_ERR(bgp->fclock);
> }
>
> - bgp->div_clk = clk_get(NULL, bgp->conf->div_ck_name);
> - ret = IS_ERR(bgp->div_clk);
> - if (ret) {
> + bgp->div_clk = devm_clk_get(&pdev->dev, bgp->conf->div_ck_name);
> + if (IS_ERR(bgp->div_clk)) {
> dev_err(&pdev->dev,
> "failed to request div_ts_ck clock ref\n");
> - ret = PTR_ERR(bgp->div_clk);
> - goto free_irqs;
> + return PTR_ERR(bgp->div_clk);
> }
>
This part is a little tricky. What board have you tried this patch? Are
you sure that now passing the struct device * you are really receiving
the clk struct?
The thing is, from top of my head, in order to pass the struct device *
you need also to change the OMAP clk data structures under arch/arm/.
And remember, for all the supported chips in this driver.
Have you check that?
Please, let me know how you tested this patch.
Cheers,
Eduardo Valentin
> for (i = 0; i < bgp->conf->sensor_count; i++) {
> @@ -1249,9 +1242,8 @@ int ti_bandgap_probe(struct platform_device *pdev)
> bgp->conf->sensors[0].ts_data->max_freq);
> if (clk_rate < bgp->conf->sensors[0].ts_data->min_freq ||
> clk_rate <= 0) {
> - ret = -ENODEV;
> dev_err(&pdev->dev, "wrong clock rate (%d)\n", clk_rate);
> - goto put_clks;
> + return -ENODEV;
> }
>
> ret = clk_set_rate(bgp->div_clk, clk_rate);
> @@ -1357,14 +1349,6 @@ remove_sensors:
> disable_clk:
> if (TI_BANDGAP_HAS(bgp, CLK_CTRL))
> clk_disable_unprepare(bgp->fclock);
> -put_clks:
> - clk_put(bgp->fclock);
> - clk_put(bgp->div_clk);
> -free_irqs:
> - if (TI_BANDGAP_HAS(bgp, TSHUT)) {
> - free_irq(gpio_to_irq(bgp->tshut_gpio), NULL);
> - gpio_free(bgp->tshut_gpio);
> - }
>
> return ret;
> }
> @@ -1388,16 +1372,6 @@ int ti_bandgap_remove(struct platform_device *pdev)
>
> if (TI_BANDGAP_HAS(bgp, CLK_CTRL))
> clk_disable_unprepare(bgp->fclock);
> - clk_put(bgp->fclock);
> - clk_put(bgp->div_clk);
> -
> - if (TI_BANDGAP_HAS(bgp, TALERT))
> - free_irq(bgp->irq, bgp);
> -
> - if (TI_BANDGAP_HAS(bgp, TSHUT)) {
> - free_irq(gpio_to_irq(bgp->tshut_gpio), NULL);
> - gpio_free(bgp->tshut_gpio);
> - }
>
> return 0;
> }
> --
> 1.7.9.5
>