From patchwork Fri Oct 10 06:02:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pramod Gurav X-Patchwork-Id: 5063701 X-Patchwork-Delegate: eduardo.valentin@ti.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AAA109F295 for ; Fri, 10 Oct 2014 05:58:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0BD942025B for ; Fri, 10 Oct 2014 05:58:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1CCF62024F for ; Fri, 10 Oct 2014 05:58:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751394AbaJJF6r (ORCPT ); Fri, 10 Oct 2014 01:58:47 -0400 Received: from smtp69.ord1c.emailsrvr.com ([108.166.43.69]:44081 "EHLO smtp69.ord1c.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751382AbaJJF6q (ORCPT ); Fri, 10 Oct 2014 01:58:46 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp1.relay.ord1c.emailsrvr.com (SMTP Server) with ESMTP id EBD6D38018F; Fri, 10 Oct 2014 01:58:45 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp1.relay.ord1c.emailsrvr.com (Authenticated sender: pramod.gurav-AT-smartplayin.com) with ESMTPSA id 65F1A3802D2; Fri, 10 Oct 2014 01:58:43 -0400 (EDT) X-Sender-Id: pramod.gurav@smartplayin.com Received: from SPINITLTDL00278.smartplayin.local ([UNAVAILABLE]. [220.227.185.53]) (using TLSv1.1 with cipher DHE-RSA-AES256-SHA) by 0.0.0.0:465 (trex/5.2.13); Fri, 10 Oct 2014 05:58:45 GMT From: Pramod Gurav To: linux-kernel@vger.kernel.org Cc: Pramod Gurav , Eduardo Valentin , Zhang Rui , linux-pm@vger.kernel.org Subject: [PATCH v3] thermal: ti-soc-thermal: Switch to using managed resources Date: Fri, 10 Oct 2014 11:32:12 +0530 Message-Id: <1412920932-7419-1-git-send-email-pramod.gurav@smartplayin.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Zhang Rui Cc: linux-pm@vger.kernel.org Signed-off-by: Pramod Gurav --- 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; }