From: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
To: Sasha Levin <sashal@kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <stable@vger.kernel.org>,
Chuhong Yuan <hslester96@gmail.com>,
Brian Masney <masneyb@onstation.org>, <linux-iio@vger.kernel.org>
Subject: Re: [PATCH AUTOSEL 4.19 482/671] iio: tsl2772: Use devm_add_action_or_reset for tsl2772_chip_off
Date: Thu, 16 Jan 2020 18:16:18 +0000 [thread overview]
Message-ID: <20200116181618.000063c2@Huawei.com> (raw)
In-Reply-To: <20200116170509.12787-219-sashal@kernel.org>
On Thu, 16 Jan 2020 12:02:00 -0500
Sasha Levin <sashal@kernel.org> wrote:
> From: Chuhong Yuan <hslester96@gmail.com>
>
> [ Upstream commit 338084135aeddb103624a6841972fb8588295cc6 ]
>
> 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.
>
> Not marked for stable as fairly hard to hit the bug and
> this is in the middle of a set making other cleanups
> to the driver. Hence will probably need explicit backporting.
Guess I was wrong and it does go on cleanly. I took a quick
look at current 4.19 driver and looks like it's fine on it's
own.
We need to be careful with this one in general though.
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> for 4.19
>
> Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
> Fixes: c06c4d793584 ("staging: iio: tsl2x7x/tsl2772: move out of staging")
> Reviewed-by: Brian Masney <masneyb@onstation.org>
> Tested-by: Brian Masney <masneyb@onstation.org>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
> 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 df5b2a0da96c..f2e308c6d6d7 100644
> --- a/drivers/iio/light/tsl2772.c
> +++ b/drivers/iio/light/tsl2772.c
> @@ -716,6 +716,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
> @@ -1711,9 +1718,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;
> @@ -1740,8 +1752,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;
next prev parent reply other threads:[~2020-01-16 18:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200116170509.12787-1-sashal@kernel.org>
2020-01-16 17:02 ` [PATCH AUTOSEL 4.19 482/671] iio: tsl2772: Use devm_add_action_or_reset for tsl2772_chip_off Sasha Levin
2020-01-16 18:16 ` Jonathan Cameron [this message]
2020-01-17 2:43 ` Sasha Levin
2020-01-16 17:02 ` [PATCH AUTOSEL 4.19 523/671] iio: dac: ad5380: fix incorrect assignment to val Sasha Levin
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=20200116181618.000063c2@Huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=hslester96@gmail.com \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masneyb@onstation.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).