From: Phil Reid <preid@electromag.com.au>
To: wsa@the-dreams.de, robh+dt@kernel.org, mark.rutland@arm.com,
sre@kernel.org, jdelvare@suse.com, jglauber@cavium.com,
david.daney@cavium.com, peda@axentia.se, preid@electromag.com.au,
benjamin.tissoires@redhat.com, linux-i2c@vger.kernel.org,
devicetree@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH v10 04/10] i2c: core: call of_i2c_setup_smbus_alert in i2c_register_adapter
Date: Tue, 25 Jul 2017 11:40:18 +0800 [thread overview]
Message-ID: <1500954024-6860-5-git-send-email-preid@electromag.com.au> (raw)
In-Reply-To: <1500954024-6860-1-git-send-email-preid@electromag.com.au>
Add a call to of_i2c_setup_smbus_alert when a i2c adapter is registered
so the the smbalert driver can be registered.
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/i2c/i2c-core-base.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 033b7b9..7006486 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -29,6 +29,7 @@
#include <linux/errno.h>
#include <linux/gpio.h>
#include <linux/i2c.h>
+#include <linux/i2c-smbus.h>
#include <linux/idr.h>
#include <linux/init.h>
#include <linux/irqflags.h>
@@ -1273,6 +1274,10 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
goto out_list;
}
+ res = of_i2c_setup_smbus_alert(adap);
+ if (res)
+ goto out_reg;
+
dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
pm_runtime_no_callbacks(&adap->dev);
@@ -1304,6 +1309,10 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
return 0;
+out_reg:
+ init_completion(&adap->dev_released);
+ device_unregister(&adap->dev);
+ wait_for_completion(&adap->dev_released);
out_list:
mutex_lock(&core_lock);
idr_remove(&i2c_adapter_idr, adap->nr);
--
1.8.3.1
next prev parent reply other threads:[~2017-07-25 3:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-25 3:40 [PATCH v10 00/10] Add sbs-manager with smbalert support Phil Reid
2017-07-25 3:40 ` [PATCH v10 02/10] i2c: i2c-smbus: Move i2c_setup_smbus_alert from i2c-smbus to i2c-core-smbus Phil Reid
2017-07-25 3:40 ` [PATCH v10 03/10] i2c: i2c-smbus: add of_i2c_setup_smbus_alert Phil Reid
2017-07-25 3:40 ` Phil Reid [this message]
2017-07-25 3:40 ` [PATCH v10 06/10] i2c: mux: pca954x: Return error if irq_create_mapping fails Phil Reid
2017-07-25 3:40 ` [PATCH v10 07/10] Documentation: Add sbs-manager device tree node documentation Phil Reid
2017-07-25 3:40 ` [PATCH v10 08/10] power: Adds support for Smart Battery System Manager Phil Reid
2017-07-25 3:40 ` [PATCH v10 09/10] power: supply: sbs-manager: Add alert callback and battery change notification Phil Reid
[not found] ` <1500954024-6860-1-git-send-email-preid-qgqNFa1JUf/o2iN0hyhwsIdd74u8MsAO@public.gmane.org>
2017-07-25 3:40 ` [PATCH v10 01/10] i2c: i2c-smbus: Use threaded irq for smbalert Phil Reid
2017-07-25 3:40 ` [PATCH v10 05/10] i2c: mux: pca954x: Call request irq after adding mux segments Phil Reid
2017-07-31 8:09 ` Peter Rosin
2017-08-01 2:01 ` Phil Reid
2017-07-25 3:40 ` [PATCH v10 10/10] power: supply: sbs-battery: move gpio present detect to sbs_get_property Phil Reid
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=1500954024-6860-5-git-send-email-preid@electromag.com.au \
--to=preid@electromag.com.au \
--cc=benjamin.tissoires@redhat.com \
--cc=david.daney@cavium.com \
--cc=devicetree@vger.kernel.org \
--cc=jdelvare@suse.com \
--cc=jglauber@cavium.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=peda@axentia.se \
--cc=robh+dt@kernel.org \
--cc=sre@kernel.org \
--cc=wsa@the-dreams.de \
/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).