linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: Alexandru Ardelean <aardelean@deviqon.com>
Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] iio: accel: da280: convert probe to device-managed functions
Date: Sat, 17 Jul 2021 18:58:09 +0100	[thread overview]
Message-ID: <20210717185809.181d38ca@jic23-huawei> (raw)
In-Reply-To: <20210628141709.80534-1-aardelean@deviqon.com>

On Mon, 28 Jun 2021 17:17:09 +0300
Alexandru Ardelean <aardelean@deviqon.com> wrote:

> This is another simple conversion to device-managed functions, requiring
> the use of devm_iio_device_register() and moving the disabling of the
> device on a devm_add_action_or_reset() hook.
> 
> The i2c_set_clientdata() can be removed, as the PM functions can work with
> just the device object, to obtain the i2c_client object.
> 
> Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
Applied,

Thanks,

Jonathan

> ---
>  drivers/iio/accel/da280.c | 26 +++++++++-----------------
>  1 file changed, 9 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/iio/accel/da280.c b/drivers/iio/accel/da280.c
> index 5edff9ba72da..9633bdae5fd4 100644
> --- a/drivers/iio/accel/da280.c
> +++ b/drivers/iio/accel/da280.c
> @@ -100,6 +100,11 @@ static enum da280_chipset da280_match_acpi_device(struct device *dev)
>  	return (enum da280_chipset) id->driver_data;
>  }
>  
> +static void da280_disable(void *client)
> +{
> +	da280_enable(client, false);
> +}
> +
>  static int da280_probe(struct i2c_client *client,
>  			const struct i2c_device_id *id)
>  {
> @@ -118,7 +123,6 @@ static int da280_probe(struct i2c_client *client,
>  
>  	data = iio_priv(indio_dev);
>  	data->client = client;
> -	i2c_set_clientdata(client, indio_dev);
>  
>  	indio_dev->info = &da280_info;
>  	indio_dev->modes = INDIO_DIRECT_MODE;
> @@ -142,22 +146,11 @@ static int da280_probe(struct i2c_client *client,
>  	if (ret < 0)
>  		return ret;
>  
> -	ret = iio_device_register(indio_dev);
> -	if (ret < 0) {
> -		dev_err(&client->dev, "device_register failed\n");
> -		da280_enable(client, false);
> -	}
> -
> -	return ret;
> -}
> -
> -static int da280_remove(struct i2c_client *client)
> -{
> -	struct iio_dev *indio_dev = i2c_get_clientdata(client);
> -
> -	iio_device_unregister(indio_dev);
> +	ret = devm_add_action_or_reset(&client->dev, da280_disable, client);
> +	if (ret)
> +		return ret;
>  
> -	return da280_enable(client, false);
> +	return devm_iio_device_register(&client->dev, indio_dev);
>  }
>  
>  #ifdef CONFIG_PM_SLEEP
> @@ -194,7 +187,6 @@ static struct i2c_driver da280_driver = {
>  		.pm = &da280_pm_ops,
>  	},
>  	.probe		= da280_probe,
> -	.remove		= da280_remove,
>  	.id_table	= da280_i2c_id,
>  };
>  


      reply	other threads:[~2021-07-17 17:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-28 14:17 Alexandru Ardelean
2021-07-17 17:58 ` Jonathan Cameron [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210717185809.181d38ca@jic23-huawei \
    --to=jic23@kernel.org \
    --cc=aardelean@deviqon.com \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH] iio: accel: da280: convert probe to device-managed functions' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).