From: Linus Walleij <linus.walleij@linaro.org>
To: Lee Jones <lee.jones@linaro.org>
Cc: Wolfram Sang <w.sang@pengutronix.de>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
STEricsson_nomadik_linux@list.st.com,
linus.walleij@stericsson.com, arnd@arndb.de,
linux-i2c@vger.kernel.org
Subject: Re: [PATCH 3/3] i2c: nomadik: Add Device Tree support to the Nomadik I2C driver
Date: Mon, 3 Sep 2012 11:22:28 +0200 [thread overview]
Message-ID: <CACRpkdZ=C1EV4WO2b=1YLHPNhsDsQdq7Kfnpzm8i7uGRtVjJuQ@mail.gmail.com> (raw)
In-Reply-To: <20120831122323.GC5962@gmail.com>
On Fri, Aug 31, 2012 at 2:23 PM, Lee Jones <lee.jones@linaro.org> wrote:
(...)
> static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
> {
> int ret = 0;
> struct nmk_i2c_controller *pdata = adev->dev.platform_data;
> + struct device_node *np = adev->dev.of_node;
> struct nmk_i2c_dev *dev;
> struct i2c_adapter *adap;
>
> + if (np) {
> + if (!pdata) {
So, if no pdata is provided, we go on to allocate some ...
> + pdata = devm_kzalloc(&adev->dev, sizeof(*pdata), GFP_KERNEL);
> + if (!pdata) {
> + ret = -ENOMEM;
> + goto err_no_mem;
> + }
> + }
> + /* Provide the default configuration as a base. */
> + pdata = &u8500_i2c;
Then you just override that pointer with a pointer to the local config.
> + nmk_i2c_of_probe(np, pdata);
> + }
> +
> if (!pdata)
> /* No i2c configuration found, using the default. */
> pdata = &u8500_i2c;
This in it's entirety does not look sound. I *think* this is what you
want to do,
replace all of the above codde (including the last if (!pdata) clause) with:
if (!pdata) {
/* If no platform data passed in, use the default configuration as
a base. */
pdata = &u8500_i2c;
if (np)
/* Further, if we have a DT node, override the default with this */
nmk_i2c_of_probe(np, pdata);
}
This makes any passed pdata take precedence, else default pdata
complemented with DT info. Which is what we want.
Yours,
Linus Walleij
next prev parent reply other threads:[~2012-09-03 9:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-23 15:01 [PATCH 1/3] ARM: ux500: Add i2c configurations to the Device Tree for DB8500 based devices Lee Jones
2012-08-23 15:01 ` [PATCH 2/3] Documentation: Device Tree binding information for i2c-nomadik driver Lee Jones
2012-08-23 15:01 ` [PATCH 3/3] i2c: nomadik: Add Device Tree support to the Nomadik I2C driver Lee Jones
2012-08-27 23:42 ` Linus Walleij
2012-08-31 10:36 ` Lee Jones
2012-08-31 11:22 ` Wolfram Sang
2012-08-31 12:04 ` Lee Jones
2012-08-31 12:23 ` Lee Jones
2012-09-03 9:22 ` Linus Walleij [this message]
2012-09-03 9:44 ` Wolfram Sang
2012-09-03 9:50 ` Lee Jones
2012-09-03 10:07 ` Lee Jones
2012-09-03 11:07 ` Linus Walleij
[not found] ` <CAF2Aj3j25w1Nn9O6hV+=i-j1ts_p_Ucswk_M7r04S7i5BzPkHg@mail.gmail.com>
2012-09-03 11:58 ` Linus Walleij
2012-09-03 12:34 ` Lee Jones
2012-09-03 13:19 ` Linus Walleij
2012-09-03 13:28 ` Lee Jones
2012-09-03 14:33 ` Stephen Warren
2012-09-03 14:35 ` Linus Walleij
2012-09-03 15:09 ` Rob Herring
2012-09-03 15:20 ` Lee Jones
2012-09-04 14:28 ` Arnd Bergmann
2012-09-04 17:27 ` Linus Walleij
2012-09-05 6:41 ` Lee Jones
2012-09-05 6:53 ` Linus Walleij
2012-09-04 17:35 ` Alessandro Rubini
2012-09-05 7:33 ` Lee Jones
2012-09-05 8:22 ` Linus Walleij
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='CACRpkdZ=C1EV4WO2b=1YLHPNhsDsQdq7Kfnpzm8i7uGRtVjJuQ@mail.gmail.com' \
--to=linus.walleij@linaro.org \
--cc=STEricsson_nomadik_linux@list.st.com \
--cc=arnd@arndb.de \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@stericsson.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=w.sang@pengutronix.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).