[PATCH] iio: mxc4005: Use device-managed APIs

[PATCH] iio: mxc4005: Use device-managed APIs

[Chuhong Yuan]

Use device-managed APIs to simplify the code.
The remove function is redundant now and can
be deleted.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
---
 drivers/iio/accel/mxc4005.c | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

diff --git a/drivers/iio/accel/mxc4005.c b/drivers/iio/accel/mxc4005.c
index 637e6e676061..d8b999023ef2 100644
--- a/drivers/iio/accel/mxc4005.c
+++ b/drivers/iio/accel/mxc4005.c
@@ -424,7 +424,7 @@ static int mxc4005_probe(struct i2c_client *client,
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->info = &mxc4005_info;
 
-	ret = iio_triggered_buffer_setup(indio_dev,
+	ret = devm_iio_triggered_buffer_setup(&client->dev, indio_dev,
 					 iio_pollfunc_store_time,
 					 mxc4005_trigger_handler,
 					 NULL);
@@ -452,7 +452,7 @@ static int mxc4005_probe(struct i2c_client *client,
 		if (ret) {
 			dev_err(&client->dev,
 				"failed to init threaded irq\n");
-			goto err_buffer_cleanup;
+			return ret;
 		}
 
 		data->dready_trig->dev.parent = &client->dev;
@@ -460,43 +460,23 @@ static int mxc4005_probe(struct i2c_client *client,
 		iio_trigger_set_drvdata(data->dready_trig, indio_dev);
 		indio_dev->trig = data->dready_trig;
 		iio_trigger_get(indio_dev->trig);
-		ret = iio_trigger_register(data->dready_trig);
+		ret = devm_iio_trigger_register(&client->dev,
+						data->dready_trig);
 		if (ret) {
 			dev_err(&client->dev,
 				"failed to register trigger\n");
-			goto err_trigger_unregister;
+			return ret;
 		}
 	}
 
-	ret = iio_device_register(indio_dev);
+	ret = devm_iio_device_register(&client->dev, indio_dev);
 	if (ret < 0) {
 		dev_err(&client->dev,
 			"unable to register iio device %d\n", ret);
-		goto err_buffer_cleanup;
+		return ret;
 	}
 
 	return 0;
-
-err_trigger_unregister:
-	iio_trigger_unregister(data->dready_trig);
-err_buffer_cleanup:
-	iio_triggered_buffer_cleanup(indio_dev);
-
-	return ret;
-}
-
-static int mxc4005_remove(struct i2c_client *client)
-{
-	struct iio_dev *indio_dev = i2c_get_clientdata(client);
-	struct mxc4005_data *data = iio_priv(indio_dev);
-
-	iio_device_unregister(indio_dev);
-
-	iio_triggered_buffer_cleanup(indio_dev);
-	if (data->dready_trig)
-		iio_trigger_unregister(data->dready_trig);
-
-	return 0;
 }
 
 static const struct acpi_device_id mxc4005_acpi_match[] = {
@@ -517,7 +497,6 @@ static struct i2c_driver mxc4005_driver = {
 		.acpi_match_table = ACPI_PTR(mxc4005_acpi_match),
 	},
 	.probe		= mxc4005_probe,
-	.remove		= mxc4005_remove,
 	.id_table	= mxc4005_id,
 };
 
-- 
2.20.1

Re: [PATCH] iio: mxc4005: Use device-managed APIs

[Jonathan Cameron]

On Fri, 26 Jul 2019 14:36:16 +0800
Chuhong Yuan <hslester96@gmail.com> wrote:

> Use device-managed APIs to simplify the code.
> The remove function is redundant now and can
> be deleted.
> 
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Applied, with a similar change to the other patches I modified earlier.

Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.

Thanks,

Jonathan

> ---
>  drivers/iio/accel/mxc4005.c | 35 +++++++----------------------------
>  1 file changed, 7 insertions(+), 28 deletions(-)
> 
> diff --git a/drivers/iio/accel/mxc4005.c b/drivers/iio/accel/mxc4005.c
> index 637e6e676061..d8b999023ef2 100644
> --- a/drivers/iio/accel/mxc4005.c
> +++ b/drivers/iio/accel/mxc4005.c
> @@ -424,7 +424,7 @@ static int mxc4005_probe(struct i2c_client *client,
>  	indio_dev->modes = INDIO_DIRECT_MODE;
>  	indio_dev->info = &mxc4005_info;
>  
> -	ret = iio_triggered_buffer_setup(indio_dev,
> +	ret = devm_iio_triggered_buffer_setup(&client->dev, indio_dev,
>  					 iio_pollfunc_store_time,
>  					 mxc4005_trigger_handler,
>  					 NULL);
> @@ -452,7 +452,7 @@ static int mxc4005_probe(struct i2c_client *client,
>  		if (ret) {
>  			dev_err(&client->dev,
>  				"failed to init threaded irq\n");
> -			goto err_buffer_cleanup;
> +			return ret;
>  		}
>  
>  		data->dready_trig->dev.parent = &client->dev;
> @@ -460,43 +460,23 @@ static int mxc4005_probe(struct i2c_client *client,
>  		iio_trigger_set_drvdata(data->dready_trig, indio_dev);
>  		indio_dev->trig = data->dready_trig;
>  		iio_trigger_get(indio_dev->trig);
> -		ret = iio_trigger_register(data->dready_trig);
> +		ret = devm_iio_trigger_register(&client->dev,
> +						data->dready_trig);
>  		if (ret) {
>  			dev_err(&client->dev,
>  				"failed to register trigger\n");
> -			goto err_trigger_unregister;
> +			return ret;
>  		}
>  	}
>  
> -	ret = iio_device_register(indio_dev);
> +	ret = devm_iio_device_register(&client->dev, indio_dev);
>  	if (ret < 0) {
>  		dev_err(&client->dev,
>  			"unable to register iio device %d\n", ret);
> -		goto err_buffer_cleanup;
> +		return ret;
I dropped the print out and tidied this up as
return devm_iio_device_register();

>  	}
>  
>  	return 0;
> -
> -err_trigger_unregister:
> -	iio_trigger_unregister(data->dready_trig);
> -err_buffer_cleanup:
> -	iio_triggered_buffer_cleanup(indio_dev);
> -
> -	return ret;
> -}
> -
> -static int mxc4005_remove(struct i2c_client *client)
> -{
> -	struct iio_dev *indio_dev = i2c_get_clientdata(client);
> -	struct mxc4005_data *data = iio_priv(indio_dev);
> -
> -	iio_device_unregister(indio_dev);
> -
> -	iio_triggered_buffer_cleanup(indio_dev);
> -	if (data->dready_trig)
> -		iio_trigger_unregister(data->dready_trig);
> -
> -	return 0;
>  }
>  
>  static const struct acpi_device_id mxc4005_acpi_match[] = {
> @@ -517,7 +497,6 @@ static struct i2c_driver mxc4005_driver = {
>  		.acpi_match_table = ACPI_PTR(mxc4005_acpi_match),
>  	},
>  	.probe		= mxc4005_probe,
> -	.remove		= mxc4005_remove,
>  	.id_table	= mxc4005_id,
>  };
>