linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Heidelberg <david@ixit.cz>
To: "Dmitry Osipenko" <digetx@gmail.com>,
	"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
	"Daniel Baluta" <daniel.baluta@nxp.com>,
	"Jonathan Cameron" <jic23@kernel.org>,
	"Hartmut Knaack" <knaack.h@gmx.de>,
	"Lars-Peter Clausen" <lars@metafoo.de>,
	"Peter Meerwald-Stadler" <pmeerw@pmeerw.net>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Mark Rutland" <mark.rutland@arm.com>
Cc: David Heidelberg <david@ixit.cz>, linux-iio@vger.kernel.org
Subject: [PATCH v4 6/7] iio: light: al3320a implement devm_add_action_or_reset
Date: Tue,  4 Feb 2020 10:30:38 +0100	[thread overview]
Message-ID: <20200204093031.616409-7-david@ixit.cz> (raw)
In-Reply-To: <20200204093031.616409-1-david@ixit.cz>

Use devm_add_action_or_reset to automatically disable the device
and allow you to get rid of the remove function entirely.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 drivers/iio/light/al3320a.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
index affa4c6c199a..49e73e24fff6 100644
--- a/drivers/iio/light/al3320a.c
+++ b/drivers/iio/light/al3320a.c
@@ -87,6 +87,13 @@ static int al3320a_set_pwr(struct i2c_client *client, bool pwr)
 	return i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG, val);
 }
 
+static void al3320a_set_pwr_off(void *_data)
+{
+	struct al3320a_data *data = _data;
+
+	al3320a_set_pwr(data->client, false);
+}
+
 static int al3320a_init(struct al3320a_data *data)
 {
 	int ret;
@@ -206,12 +213,14 @@ static int al3320a_probe(struct i2c_client *client,
 		dev_err(&client->dev, "al3320a chip init failed\n");
 		return ret;
 	}
-	return devm_iio_device_register(&client->dev, indio_dev);
-}
 
-static int al3320a_remove(struct i2c_client *client)
-{
-	return al3320a_set_pwr(client, false);
+	ret = devm_add_action_or_reset(&client->dev,
+					al3320a_set_pwr_off,
+					data);
+	if (ret < 0)
+		return ret;
+
+	return devm_iio_device_register(&client->dev, indio_dev);
 }
 
 static int __maybe_unused al3320a_suspend(struct device *dev)
@@ -238,7 +247,6 @@ static struct i2c_driver al3320a_driver = {
 		.pm = &al3320a_pm_ops,
 	},
 	.probe		= al3320a_probe,
-	.remove		= al3320a_remove,
 	.id_table	= al3320a_id,
 };
 
-- 
2.25.0


  parent reply	other threads:[~2020-02-04  9:34 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-04  9:30 [PATCH v4 0/7] AL3010 introduction David Heidelberg
2020-02-04  9:30 ` [PATCH v4 1/7] dt-bindings: iio: light: add support for Dyna-Image AL3320A David Heidelberg
2020-02-06 19:07   ` Rob Herring
2020-02-06 21:16     ` David Heidelberg
2020-02-06 21:27       ` Rob Herring
2020-02-06 21:44         ` David Heidelberg
2020-02-04  9:30 ` [PATCH v4 2/7] dt-bindings: iio: light: add support for Dyna-Image AL3010 David Heidelberg
2020-02-04  9:52   ` Michał Mirosław
2020-02-04 15:10     ` Dmitry Osipenko
2020-02-04  9:30 ` [PATCH v4 3/7] iio: light: al3320a slightly improve code formatting David Heidelberg
2020-02-06 11:42   ` Jonathan Cameron
2020-02-06 14:50   ` Dmitry Osipenko
2020-02-06 14:51     ` Dmitry Osipenko
2020-02-04  9:30 ` [PATCH v4 4/7] iio: light: add Dyna-Image AL3010 driver David Heidelberg
2020-02-04 15:17   ` Dmitry Osipenko
2020-02-06 11:48   ` Jonathan Cameron
2020-02-06 14:55     ` Dmitry Osipenko
2020-02-04  9:30 ` [PATCH v4 5/7] iio: light: al3320a implement suspend support David Heidelberg
2020-02-04  9:30 ` David Heidelberg [this message]
2020-02-04  9:30 ` [PATCH v4 7/7] iio: light: al3320a allow module autoload and polish David Heidelberg

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=20200204093031.616409-7-david@ixit.cz \
    --to=david@ixit.cz \
    --cc=daniel.baluta@nxp.com \
    --cc=digetx@gmail.com \
    --cc=jic23@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mirq-linux@rere.qmqm.pl \
    --cc=pmeerw@pmeerw.net \
    --cc=robh+dt@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).