Linux-IIO Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v4 2/4] iio: tsl2772: Use devm_add_action_or_reset for tsl2772_chip_off
@ 2019-08-01  7:36 Chuhong Yuan
  2019-08-01  9:35 ` Brian Masney
  0 siblings, 1 reply; 3+ messages in thread
From: Chuhong Yuan @ 2019-08-01  7:36 UTC (permalink / raw)
  To: unlisted-recipients:; (no To-header on input)
  Cc: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
	Peter Meerwald-Stadler, Brian Masney, linux-iio, linux-kernel,
	Chuhong Yuan

Use devm_add_action_or_reset to call tsl2772_chip_off
when the device is removed.
This also fixes the issue that the chip is turned off
before the device is unregistered.

Fixes: 4e24c1719f34 ("staging: iio: tsl2x7x: rename driver to tsl2772")
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
---
Changes in v4:
  - Split v3 into three patches.
  - Revise description to make it more precise.

 drivers/iio/light/tsl2772.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/iio/light/tsl2772.c b/drivers/iio/light/tsl2772.c
index 29cfd8ae2700..e866ae40f157 100644
--- a/drivers/iio/light/tsl2772.c
+++ b/drivers/iio/light/tsl2772.c
@@ -860,6 +860,13 @@ static int tsl2772_chip_off(struct iio_dev *indio_dev)
 	return tsl2772_write_control_reg(chip, 0x00);
 }
 
+static void tsl2772_chip_off_action(void *data)
+{
+	struct iio_dev *indio_dev = data;
+
+	tsl2772_chip_off(indio_dev);
+}
+
 /**
  * tsl2772_invoke_change - power cycle the device to implement the user
  *                         parameters
@@ -1877,9 +1884,14 @@ static int tsl2772_probe(struct i2c_client *clientp,
 	if (ret < 0)
 		return ret;
 
+	ret = devm_add_action_or_reset(&clientp->dev,
+					tsl2772_chip_off_action,
+					indio_dev);
+	if (ret < 0)
+		return ret;
+
 	ret = iio_device_register(indio_dev);
 	if (ret) {
-		tsl2772_chip_off(indio_dev);
 		dev_err(&clientp->dev,
 			"%s: iio registration failed\n", __func__);
 		return ret;
@@ -1926,8 +1938,6 @@ static int tsl2772_remove(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
 
-	tsl2772_chip_off(indio_dev);
-
 	iio_device_unregister(indio_dev);
 
 	return 0;
-- 
2.20.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v4 2/4] iio: tsl2772: Use devm_add_action_or_reset for tsl2772_chip_off
  2019-08-01  7:36 [PATCH v4 2/4] iio: tsl2772: Use devm_add_action_or_reset for tsl2772_chip_off Chuhong Yuan
@ 2019-08-01  9:35 ` Brian Masney
  2019-08-05 15:29   ` Jonathan Cameron
  0 siblings, 1 reply; 3+ messages in thread
From: Brian Masney @ 2019-08-01  9:35 UTC (permalink / raw)
  To: Chuhong Yuan
  Cc: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
	Peter Meerwald-Stadler, linux-iio, linux-kernel

On Thu, Aug 01, 2019 at 03:36:05PM +0800, Chuhong Yuan wrote:
> Use devm_add_action_or_reset to call tsl2772_chip_off
> when the device is removed.
> This also fixes the issue that the chip is turned off
> before the device is unregistered.
> 
> Fixes: 4e24c1719f34 ("staging: iio: tsl2x7x: rename driver to tsl2772")
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>

Let's use this Fixes tag instead:

Fixes: c06c4d793584 ("staging: iio: tsl2x7x/tsl2772: move out of staging")

I'd wait and see if Jonathan wants you to resend out the series if he
has any changes.

Brian


> ---
> Changes in v4:
>   - Split v3 into three patches.
>   - Revise description to make it more precise.
> 
>  drivers/iio/light/tsl2772.c | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/iio/light/tsl2772.c b/drivers/iio/light/tsl2772.c
> index 29cfd8ae2700..e866ae40f157 100644
> --- a/drivers/iio/light/tsl2772.c
> +++ b/drivers/iio/light/tsl2772.c
> @@ -860,6 +860,13 @@ static int tsl2772_chip_off(struct iio_dev *indio_dev)
>  	return tsl2772_write_control_reg(chip, 0x00);
>  }
>  
> +static void tsl2772_chip_off_action(void *data)
> +{
> +	struct iio_dev *indio_dev = data;
> +
> +	tsl2772_chip_off(indio_dev);
> +}
> +
>  /**
>   * tsl2772_invoke_change - power cycle the device to implement the user
>   *                         parameters
> @@ -1877,9 +1884,14 @@ static int tsl2772_probe(struct i2c_client *clientp,
>  	if (ret < 0)
>  		return ret;
>  
> +	ret = devm_add_action_or_reset(&clientp->dev,
> +					tsl2772_chip_off_action,
> +					indio_dev);
> +	if (ret < 0)
> +		return ret;
> +
>  	ret = iio_device_register(indio_dev);
>  	if (ret) {
> -		tsl2772_chip_off(indio_dev);
>  		dev_err(&clientp->dev,
>  			"%s: iio registration failed\n", __func__);
>  		return ret;
> @@ -1926,8 +1938,6 @@ static int tsl2772_remove(struct i2c_client *client)
>  {
>  	struct iio_dev *indio_dev = i2c_get_clientdata(client);
>  
> -	tsl2772_chip_off(indio_dev);
> -
>  	iio_device_unregister(indio_dev);
>  
>  	return 0;
> -- 
> 2.20.1

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v4 2/4] iio: tsl2772: Use devm_add_action_or_reset for tsl2772_chip_off
  2019-08-01  9:35 ` Brian Masney
@ 2019-08-05 15:29   ` Jonathan Cameron
  0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2019-08-05 15:29 UTC (permalink / raw)
  To: Brian Masney
  Cc: Chuhong Yuan, Hartmut Knaack, Lars-Peter Clausen,
	Peter Meerwald-Stadler, linux-iio, linux-kernel

On Thu, 1 Aug 2019 05:35:26 -0400
Brian Masney <masneyb@onstation.org> wrote:

> On Thu, Aug 01, 2019 at 03:36:05PM +0800, Chuhong Yuan wrote:
> > Use devm_add_action_or_reset to call tsl2772_chip_off
> > when the device is removed.
> > This also fixes the issue that the chip is turned off
> > before the device is unregistered.
> > 
> > Fixes: 4e24c1719f34 ("staging: iio: tsl2x7x: rename driver to tsl2772")
> > Signed-off-by: Chuhong Yuan <hslester96@gmail.com>  
> 
> Let's use this Fixes tag instead:
> 
> Fixes: c06c4d793584 ("staging: iio: tsl2x7x/tsl2772: move out of staging")
> 
> I'd wait and see if Jonathan wants you to resend out the series if he
> has any changes.

I've added a note to say this will probably need a backport for stable.
Actually in that case we should be looking for a more minimal solution than
this anyway.

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

Thanks,

Jonathan

> 
> Brian
> 
> 
> > ---
> > Changes in v4:
> >   - Split v3 into three patches.
> >   - Revise description to make it more precise.
> > 
> >  drivers/iio/light/tsl2772.c | 16 +++++++++++++---
> >  1 file changed, 13 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/iio/light/tsl2772.c b/drivers/iio/light/tsl2772.c
> > index 29cfd8ae2700..e866ae40f157 100644
> > --- a/drivers/iio/light/tsl2772.c
> > +++ b/drivers/iio/light/tsl2772.c
> > @@ -860,6 +860,13 @@ static int tsl2772_chip_off(struct iio_dev *indio_dev)
> >  	return tsl2772_write_control_reg(chip, 0x00);
> >  }
> >  
> > +static void tsl2772_chip_off_action(void *data)
> > +{
> > +	struct iio_dev *indio_dev = data;
> > +
> > +	tsl2772_chip_off(indio_dev);
> > +}
> > +
> >  /**
> >   * tsl2772_invoke_change - power cycle the device to implement the user
> >   *                         parameters
> > @@ -1877,9 +1884,14 @@ static int tsl2772_probe(struct i2c_client *clientp,
> >  	if (ret < 0)
> >  		return ret;
> >  
> > +	ret = devm_add_action_or_reset(&clientp->dev,
> > +					tsl2772_chip_off_action,
> > +					indio_dev);
> > +	if (ret < 0)
> > +		return ret;
> > +
> >  	ret = iio_device_register(indio_dev);
> >  	if (ret) {
> > -		tsl2772_chip_off(indio_dev);
> >  		dev_err(&clientp->dev,
> >  			"%s: iio registration failed\n", __func__);
> >  		return ret;
> > @@ -1926,8 +1938,6 @@ static int tsl2772_remove(struct i2c_client *client)
> >  {
> >  	struct iio_dev *indio_dev = i2c_get_clientdata(client);
> >  
> > -	tsl2772_chip_off(indio_dev);
> > -
> >  	iio_device_unregister(indio_dev);
> >  
> >  	return 0;
> > -- 
> > 2.20.1  


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-01  7:36 [PATCH v4 2/4] iio: tsl2772: Use devm_add_action_or_reset for tsl2772_chip_off Chuhong Yuan
2019-08-01  9:35 ` Brian Masney
2019-08-05 15:29   ` Jonathan Cameron

Linux-IIO Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-iio/0 linux-iio/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-iio linux-iio/ https://lore.kernel.org/linux-iio \
		linux-iio@vger.kernel.org linux-iio@archiver.kernel.org
	public-inbox-index linux-iio


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-iio


AGPL code for this site: git clone https://public-inbox.org/ public-inbox