From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f67.google.com ([74.125.83.67]:33758 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753776AbdGLQcg (ORCPT ); Wed, 12 Jul 2017 12:32:36 -0400 Received: by mail-pg0-f67.google.com with SMTP id u62so3612900pgb.0 for ; Wed, 12 Jul 2017 09:32:31 -0700 (PDT) From: Akinobu Mita To: linux-iio@vger.kernel.org Cc: Akinobu Mita , Daniel Baluta , Jonathan Cameron Subject: [PATCH 6/8] iio: adc: ti-ads1015: use devm_iio_triggered_buffer_setup Date: Thu, 13 Jul 2017 01:32:02 +0900 Message-Id: <1499877124-21658-7-git-send-email-akinobu.mita@gmail.com> In-Reply-To: <1499877124-21658-1-git-send-email-akinobu.mita@gmail.com> References: <1499877124-21658-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org Use devm_iio_triggered_buffer_setup to simplify the error path in the probe() and remove() function. Cc: Daniel Baluta Cc: Jonathan Cameron Signed-off-by: Akinobu Mita --- drivers/iio/adc/ti-ads1015.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c index f5f256a..821e649 100644 --- a/drivers/iio/adc/ti-ads1015.c +++ b/drivers/iio/adc/ti-ads1015.c @@ -620,9 +620,9 @@ static int ads1015_probe(struct i2c_client *client, return PTR_ERR(data->regmap); } - ret = iio_triggered_buffer_setup(indio_dev, NULL, - ads1015_trigger_handler, - &ads1015_buffer_setup_ops); + ret = devm_iio_triggered_buffer_setup(&client->dev, indio_dev, NULL, + ads1015_trigger_handler, + &ads1015_buffer_setup_ops); if (ret < 0) { dev_err(&client->dev, "iio triggered buffer setup failed\n"); return ret; @@ -636,7 +636,7 @@ static int ads1015_probe(struct i2c_client *client, ret = pm_runtime_set_active(&client->dev); if (ret) - goto err_buffer_cleanup; + return ret; pm_runtime_set_autosuspend_delay(&client->dev, ADS1015_SLEEP_DELAY_MS); pm_runtime_use_autosuspend(&client->dev); pm_runtime_enable(&client->dev); @@ -644,15 +644,10 @@ static int ads1015_probe(struct i2c_client *client, ret = iio_device_register(indio_dev); if (ret < 0) { dev_err(&client->dev, "Failed to register IIO device\n"); - goto err_buffer_cleanup; + return ret; } return 0; - -err_buffer_cleanup: - iio_triggered_buffer_cleanup(indio_dev); - - return ret; } static int ads1015_remove(struct i2c_client *client) @@ -666,8 +661,6 @@ static int ads1015_remove(struct i2c_client *client) pm_runtime_set_suspended(&client->dev); pm_runtime_put_noidle(&client->dev); - iio_triggered_buffer_cleanup(indio_dev); - /* power down single shot mode */ return ads1015_set_conv_mode(data, ADS1015_SINGLESHOT); } -- 2.7.4