From patchwork Fri Jul 29 21:42:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 9252833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2091460757 for ; Fri, 29 Jul 2016 21:42:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11BCF28409 for ; Fri, 29 Jul 2016 21:42:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0698F2842B; Fri, 29 Jul 2016 21:42:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A927128409 for ; Fri, 29 Jul 2016 21:42:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754177AbcG2Vm6 (ORCPT ); Fri, 29 Jul 2016 17:42:58 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:48122 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750868AbcG2Vm5 (ORCPT ); Fri, 29 Jul 2016 17:42:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=Message-Id:Date:Subject:Cc:To:From; bh=2Hc1UbqpUth70pXuNm6tWXUwdyvSAA1kPqNfO2LUXXI=; b=gyPYSqrlodiXZ8P+8rJWDDaarz d4ffVQvq0cWJvRkpXeSbiqiSFfJs+iqNkN8Hj5HeZE20e4lBH1OjL+5Ixpbp7h/QcmmxRxrkfAQeO wYupcC2c1DK7RWXRT6B+SF/5Ha2yMkI8AkKHHyjG805mSibOTPbcCVlTax3HlbIB3DVaf1sST0m8b MvjR94KH8EPmDACu5yiWzlXIwGH6cNmDkBN/HOY3m5EfANkdtGUGXo+eFF5BY/aOeUjzF4Jzb20bk U137GOrxRlpXRb3FnhpbZSaV2q7hXzrffc/UP19q2yDm/260GyLRLHbnHCFdJ6tg0TMC1Al4T0RNw SJg0pR9w==; Received: from 108-223-40-66.lightspeed.sntcca.sbcglobal.net ([108.223.40.66]:44806 helo=localhost) by bh-25.webhostbox.net with esmtpa (Exim 4.86_1) (envelope-from ) id 1bTFYM-000q9y-5y; Fri, 29 Jul 2016 21:42:46 +0000 From: Guenter Roeck To: Hardware Monitoring Cc: Jean Delvare , Guenter Roeck Subject: [PATCH 1/3] hwmon: (ntc_thermistor) Use devm_iio_channel_get Date: Fri, 29 Jul 2016 14:42:42 -0700 Message-Id: <1469828564-21928-1-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 2.5.0 X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-hwmon-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use devm_iio_channel_get() instead of iio_channel_get to simplify error handling and device removal. Signed-off-by: Guenter Roeck --- drivers/hwmon/ntc_thermistor.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/hwmon/ntc_thermistor.c b/drivers/hwmon/ntc_thermistor.c index 8ef7b713cb1a..485701ca3609 100644 --- a/drivers/hwmon/ntc_thermistor.c +++ b/drivers/hwmon/ntc_thermistor.c @@ -331,7 +331,7 @@ ntc_thermistor_parse_dt(struct platform_device *pdev) if (!pdata) return ERR_PTR(-ENOMEM); - chan = iio_channel_get(&pdev->dev, NULL); + chan = devm_iio_channel_get(&pdev->dev, NULL); if (IS_ERR(chan)) return ERR_CAST(chan); @@ -359,11 +359,6 @@ ntc_thermistor_parse_dt(struct platform_device *pdev) return pdata; } -static void ntc_iio_channel_release(struct ntc_thermistor_platform_data *pdata) -{ - if (pdata->chan) - iio_channel_release(pdata->chan); -} #else static struct ntc_thermistor_platform_data * ntc_thermistor_parse_dt(struct platform_device *pdev) @@ -373,8 +368,6 @@ ntc_thermistor_parse_dt(struct platform_device *pdev) #define ntc_match NULL -static void ntc_iio_channel_release(struct ntc_thermistor_platform_data *pdata) -{ } #endif static inline u64 div64_u64_safe(u64 dividend, u64 divisor) @@ -685,18 +678,15 @@ static int ntc_thermistor_probe(struct platform_device *pdev) return 0; err_after_sysfs: sysfs_remove_group(&data->dev->kobj, &ntc_attr_group); - ntc_iio_channel_release(pdata); return ret; } static int ntc_thermistor_remove(struct platform_device *pdev) { struct ntc_data *data = platform_get_drvdata(pdev); - struct ntc_thermistor_platform_data *pdata = data->pdata; hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&data->dev->kobj, &ntc_attr_group); - ntc_iio_channel_release(pdata); return 0; }