From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751211AbbJDEes (ORCPT ); Sun, 4 Oct 2015 00:34:48 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:34769 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751090AbbJDEeq (ORCPT ); Sun, 4 Oct 2015 00:34:46 -0400 From: Shraddha Barke To: Jonathan Cameron , Lars-Peter Clausen , Michael Hennerich Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] Staging: iio: meter: Use devm functions Date: Sun, 4 Oct 2015 10:04:32 +0530 Message-Id: <1443933272-23398-1-git-send-email-shraddha.6596@gmail.com> X-Mailer: git-send-email 2.1.4 X-Cyberoam-smtpxy-version: 1.0.6.3 X-Cyberoam-AV-Policy: default X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A150204.5610AC64.005F,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 X-CTCH-Score: 0.000 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce use of managed resource function devm_iio_trigger_alloc instead of iio_trigger_alloc and devm_request_irq instead of request_irq Remove corresponding calls to iio_trigger_free and free_irq in the probe and remove functions. The now unnecessary labels error_free_trig and err_free_irq are dropped. Signed-off-by: Shraddha Barke --- drivers/staging/iio/meter/ade7758_trigger.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/drivers/staging/iio/meter/ade7758_trigger.c b/drivers/staging/iio/meter/ade7758_trigger.c index 5b35a7f..e313b37 100644 --- a/drivers/staging/iio/meter/ade7758_trigger.c +++ b/drivers/staging/iio/meter/ade7758_trigger.c @@ -63,21 +63,21 @@ int ade7758_probe_trigger(struct iio_dev *indio_dev) struct ade7758_state *st = iio_priv(indio_dev); int ret; - st->trig = iio_trigger_alloc("%s-dev%d", - spi_get_device_id(st->us)->name, - indio_dev->id); + st->trig = devm_iio_trigger_alloc(&indio_dev->id, "%s-dev%d", + spi_get_device_id(st->us)->name, + indio_dev->id); if (!st->trig) { ret = -ENOMEM; goto error_ret; } - ret = request_irq(st->us->irq, - ade7758_data_rdy_trig_poll, - IRQF_TRIGGER_LOW, - spi_get_device_id(st->us)->name, - st->trig); + ret = devm_request_irq(&indio_dev->dev, st->us->irq, + ade7758_data_rdy_trig_poll, + IRQF_TRIGGER_LOW, + spi_get_device_id(st->us)->name, + st->trig); if (ret) - goto error_free_trig; + goto error_ret st->trig->dev.parent = &st->us->dev; st->trig->ops = &ade7758_trigger_ops; @@ -87,14 +87,10 @@ int ade7758_probe_trigger(struct iio_dev *indio_dev) /* select default trigger */ indio_dev->trig = iio_trigger_get(st->trig); if (ret) - goto error_free_irq; + goto error_ret; return 0; -error_free_irq: - free_irq(st->us->irq, st->trig); -error_free_trig: - iio_trigger_free(st->trig); error_ret: return ret; } @@ -104,6 +100,4 @@ void ade7758_remove_trigger(struct iio_dev *indio_dev) struct ade7758_state *st = iio_priv(indio_dev); iio_trigger_unregister(st->trig); - free_irq(st->us->irq, st->trig); - iio_trigger_free(st->trig); } -- 2.1.4