From: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
To: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>,
Pantelis Antoniou
<pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
Cc: Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>,
Matt Porter <matt.porter-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
Koen Kooi
<koen-QLwJDigV5abLmq1fohREcCpxlwaOVQ5f@public.gmane.org>,
Greg Kroah-Hartman
<gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>,
Alison Chaiken
<Alison_Chaiken-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>,
Dinh Nguyen <dinh.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Jan Lubbe <jluebbe-H4yykcOXDpCzQB+pC5nmwQ@public.gmane.org>,
Alexander Sverdlin
<alexander.sverdlin-OYasijW0DpE@public.gmane.org>,
Michael Stickel <ms-g5CePrrZ5ROELgA04lAiVw@public.gmane.org>,
Dirk Behme <dirk.behme-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Alan Tull
<delicious.quinoa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
Michael Bohan <mbohan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>,
Ionut Nicu <ioan.nicu.ext-OYasijW0DpE@public.gmane.org>,
Michal Simek <monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org>,
Matt Ranostay <mranostay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Joel Becker <jlbec-aKy9MeLSZ9dg9hUCZPvPmw@public.gmane.org>,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>,
linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Pete Po
Subject: Re: [PATCH v8 6/8] OF: i2c: Add OF notifier handler
Date: Fri, 21 Nov 2014 15:08:37 +0000 [thread overview]
Message-ID: <20141121150837.20DC4C40D85@trevor.secretlab.ca> (raw)
In-Reply-To: <546E9D75.3000208-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
On Thu, 20 Nov 2014 18:03:33 -0800
, Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
wrote:
> On 11/20/2014 05:53 PM, Grant Likely wrote:
> > On Tue, 28 Oct 2014 22:36:03 +0200
> > , Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
> > wrote:
> >> Add OF notifier handler needed for creating/destroying i2c devices
> >> according to dynamic runtime changes in the DT live tree.
> >>
> >> Signed-off-by: Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
> >> ---
> >> drivers/i2c/i2c-core.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++-
> >> 1 file changed, 78 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> >> index e6da9d3..e751b78 100644
> >> --- a/drivers/i2c/i2c-core.c
> >> +++ b/drivers/i2c/i2c-core.c
> >> @@ -1470,6 +1470,7 @@ struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node)
> >> return i2c_verify_adapter(dev);
> >> }
> >> EXPORT_SYMBOL(of_find_i2c_adapter_by_node);
> >> +
> >> #else
> >> static void of_i2c_register_devices(struct i2c_adapter *adap) { }
> >> #endif /* CONFIG_OF */
> >> @@ -1955,6 +1956,71 @@ void i2c_clients_command(struct i2c_adapter *adap, unsigned int cmd, void *arg)
> >> }
> >> EXPORT_SYMBOL(i2c_clients_command);
> >>
> >> +#if IS_ENABLED(CONFIG_OF)
> >> +
> >> +static int of_i2c_notify(struct notifier_block *nb,
> >> + unsigned long action, void *arg)
> >> +{
> >> + struct device_node *dn;
> >> + struct i2c_adapter *adap;
> >> + struct i2c_client *client;
> >> + int state;
> >> +
> >> + state = of_reconfig_get_state_change(action, arg);
> >> + if (state == -1)
> >> + return NOTIFY_OK;
> >> +
> >> + switch (action) {
> >> + case OF_RECONFIG_ATTACH_NODE:
> >> + case OF_RECONFIG_DETACH_NODE:
> >> + dn = arg;
> >> + break;
> >> + case OF_RECONFIG_ADD_PROPERTY:
> >> + case OF_RECONFIG_REMOVE_PROPERTY:
> >> + case OF_RECONFIG_UPDATE_PROPERTY:
> >> + dn = ((struct of_prop_reconfig *)arg)->dn;
> >> + break;
> >> + default:
> >> + return NOTIFY_OK;
> >> + }
> >> +
> >> + if (state) {
> >> +
> >> + adap = of_find_i2c_adapter_by_node(dn->parent);
> >> + if (adap == NULL)
> >> + return NOTIFY_OK; /* not for us */
> >> +
> >> + client = of_i2c_register_device(adap, dn);
> >> + put_device(&adap->dev);
> >> +
> >> + if (IS_ERR(client)) {
> >> + pr_err("%s: failed to create for '%s'\n",
> >> + __func__, dn->full_name);
> >> + return notifier_from_errno(PTR_ERR(client));
> >> + }
> >> +
> >> + } else {
> >> +
> >> + /* find our device by node */
> >> + client = of_find_i2c_device_by_node(dn);
> >> + if (client == NULL)
> >> + return NOTIFY_OK; /* no? not meant for us */
> >> +
> >> + /* unregister takes one ref away */
> >> + i2c_unregister_device(client);
> >> +
> >> + /* and put the reference of the find */
> >> + put_device(&client->dev);
> >> +
> >> + }
> >
> > Nit: odd whitespace
> >
> >> +
> >> + return NOTIFY_OK;
> >> +}
> >> +
> >> +static struct notifier_block i2c_of_notifier;
> >> +
> >> +#endif
> >> +
> >> static int __init i2c_init(void)
> >> {
> >> int retval;
> >> @@ -1972,8 +2038,19 @@ static int __init i2c_init(void)
> >> retval = i2c_add_driver(&dummy_driver);
> >> if (retval)
> >> goto class_err;
> >> - return 0;
> >>
> >> +#if IS_ENABLED(CONFIG_OF)
> >> + i2c_of_notifier.notifier_call = of_i2c_notify;
>
> Wouldn't it be easier to just initialize i2c_of_notifier above instead of
> here in the code ? Or is there a reason for doing it here ?
Yes, absolutely. This code should also depend on CONFIG_OF_DYNAMIC too,
not merely CONFIG_OF.
>
> Thanks,
> Guenter
>
> >> + retval = of_reconfig_notifier_register(&i2c_of_notifier);
> >> + if (retval)
> >> + goto notifier_err;
> >> +#endif
We can also get rid of the ugly #ifdef in the body by creating empty
stubs for of_reconfig_notify_{register,unregister}() and doing the
following:
if (IS_ENABLED(CONFIG_OF_DYNAMIC))
WARN_ON(of_reconfig_notifier_register(&i2c_of_notifier))
I picked up the patch into my tree and made the above changes because
they're pretty trivial. If Wolfram is okay with it then I can take the
whole series through my tree. Otherwise I'll put the of_reconfig_* empty
stubs into a separate branch that he and broonie can both pull.
g.
> >> +
> >> + return 0;
> >> +#if IS_ENABLED(CONFIG_OF)
> >> +notifier_err:
> >> + i2c_del_driver(&dummy_driver);
> >> +#endif
> >
> > Similar to my comment on the platform bus, don't break the entire bus if
> > registration of the notifier fails. I would drop the error case and just
> > do a WARN_ON() if it fails.
> >
> > Otherwise:
> >
> > Acked-by: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> >
> >> class_err:
> >> #ifdef CONFIG_I2C_COMPAT
> >> class_compat_unregister(i2c_adapter_compat_class);
> >> --
> >> 1.7.12
> >>
> >
> >
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2014-11-21 15:08 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 20:35 [PATCH v8 0/8] Device Tree Overlays - 8th time's the charm Pantelis Antoniou
[not found] ` <1414528565-10907-1-git-send-email-pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-10-28 20:35 ` [PATCH v8 1/8] OF: Introduce DT overlay support. (v2) Pantelis Antoniou
[not found] ` <1414528565-10907-2-git-send-email-pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-11-13 23:36 ` Grant Likely
[not found] ` <20141113233618.1C378C40B52-WNowdnHR2B42iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2014-11-17 14:35 ` Pantelis Antoniou
[not found] ` <3DA4B86C-C294-400D-8D03-D850B940CF7B-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-11-17 22:54 ` Grant Likely
2014-10-28 20:36 ` [PATCH v8 4/8] OF: platform: Add OF notifier handler Pantelis Antoniou
[not found] ` <1414528565-10907-5-git-send-email-pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-11-13 23:29 ` Grant Likely
[not found] ` <20141113232944.1F136C40B52-WNowdnHR2B42iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2014-11-14 15:13 ` Pantelis Antoniou
2014-10-28 20:35 ` [PATCH v8 2/8] OF: selftest: Add overlay self-test support. (v2) Pantelis Antoniou
2014-10-28 20:36 ` [PATCH v8 3/8] OF: DT-Overlay configfs interface (v2) Pantelis Antoniou
[not found] ` <1414528565-10907-4-git-send-email-pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-11-25 10:28 ` Grant Likely
2014-11-25 14:50 ` Pantelis Antoniou
[not found] ` <773D4828-4530-46E7-8786-1DBA490C36EB-wVdstyuyKrO8r51toPun2/C9HSW9iNxf@public.gmane.org>
2014-11-26 12:49 ` Grant Likely
2014-10-28 20:36 ` [PATCH v8 5/8] of: i2c: Export single device registration method Pantelis Antoniou
[not found] ` <1414528565-10907-6-git-send-email-pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-11-21 1:46 ` Grant Likely
[not found] ` <20141121014631.C86D5C413E8-WNowdnHR2B42iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2014-11-23 16:22 ` Wolfram Sang
2014-10-28 20:36 ` [PATCH v8 6/8] OF: i2c: Add OF notifier handler Pantelis Antoniou
[not found] ` <1414528565-10907-7-git-send-email-pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-11-21 1:53 ` Grant Likely
2014-11-21 2:03 ` Guenter Roeck
[not found] ` <546E9D75.3000208-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2014-11-21 15:08 ` Grant Likely [this message]
[not found] ` <20141121150837.20DC4C40D85-WNowdnHR2B42iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2014-11-21 15:11 ` Pantelis Antoniou
2014-11-23 16:23 ` Wolfram Sang
2014-10-28 20:36 ` [PATCH v8 7/8] of: spi: Export single device registration method and accessors Pantelis Antoniou
2014-10-29 7:44 ` Alexander Sverdlin
[not found] ` <54509AE2.80404-OYasijW0DpE@public.gmane.org>
2014-10-29 8:19 ` Pantelis Antoniou
2014-10-28 20:36 ` [PATCH v8 8/8] OF: spi: Add OF notifier handler Pantelis Antoniou
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=20141121150837.20DC4C40D85@trevor.secretlab.ca \
--to=grant.likely-s3s/wqlpoipyb63q8fvjnq@public.gmane.org \
--cc=Alison_Chaiken-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org \
--cc=alexander.sverdlin-OYasijW0DpE@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=delicious.quinoa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=dinh.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=dirk.behme-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
--cc=ioan.nicu.ext-OYasijW0DpE@public.gmane.org \
--cc=jlbec-aKy9MeLSZ9dg9hUCZPvPmw@public.gmane.org \
--cc=jluebbe-H4yykcOXDpCzQB+pC5nmwQ@public.gmane.org \
--cc=koen-QLwJDigV5abLmq1fohREcCpxlwaOVQ5f@public.gmane.org \
--cc=linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=matt.porter-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=mbohan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \
--cc=monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org \
--cc=mranostay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=ms-g5CePrrZ5ROELgA04lAiVw@public.gmane.org \
--cc=pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org \
--cc=robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
--cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \
--cc=wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.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).