From: Peter Rosin <peda@axentia.se>
To: Rob Herring <robh@kernel.org>, linux-kernel@vger.kernel.org
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Michael Ellerman <mpe@ellerman.id.au>,
linux-i2c@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH] i2c: Convert to using %pOFn instead of device_node.name
Date: Tue, 28 Aug 2018 08:33:03 +0200 [thread overview]
Message-ID: <3fa33583-f748-1708-2274-0a6f4e81004b@axentia.se> (raw)
In-Reply-To: <20180828015252.28511-21-robh@kernel.org>
On 2018-08-28 03:52, Rob Herring wrote:
> In preparation to remove the node name pointer from struct device_node,
> convert printf users to use the %pOFn format specifier.
>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: Peter Rosin <peda@axentia.se>
> Cc: linux-i2c@vger.kernel.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> drivers/i2c/busses/i2c-powermac.c | 15 ++++++++-------
> drivers/i2c/muxes/i2c-mux-gpmux.c | 4 ++--
> 2 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
> index f2a2067525ef..b706fd136ca5 100644
> --- a/drivers/i2c/busses/i2c-powermac.c
> +++ b/drivers/i2c/busses/i2c-powermac.c
> @@ -390,7 +390,6 @@ static int i2c_powermac_probe(struct platform_device *dev)
> struct pmac_i2c_bus *bus = dev_get_platdata(&dev->dev);
> struct device_node *parent = NULL;
Lose the initializer...
> struct i2c_adapter *adapter;
> - const char *basename;
> int rc;
>
> if (bus == NULL)
> @@ -407,23 +406,25 @@ static int i2c_powermac_probe(struct platform_device *dev)
> parent = of_get_parent(pmac_i2c_get_controller(bus));
> if (parent == NULL)
> return -EINVAL;
> - basename = parent->name;
> + snprintf(adapter->name, sizeof(adapter->name), "%pOFn %d",
> + parent,
> + pmac_i2c_get_channel(bus));
...and I would have written "parent, pmac_i2c_get_channel(bus));" on one line,
but maybe that's just me.
Anyway, with the initializer fix,
Reviewed-by: Peter Rosin <peda@axentia.se>
(Wolfram, no need to split this, just take it in full.)
Cheers,
Peter
> + of_node_put(parent);
> break;
> case pmac_i2c_bus_pmu:
> - basename = "pmu";
> + snprintf(adapter->name, sizeof(adapter->name), "pmu %d",
> + pmac_i2c_get_channel(bus));
> break;
> case pmac_i2c_bus_smu:
> /* This is not what we used to do but I'm fixing drivers at
> * the same time as this change
> */
> - basename = "smu";
> + snprintf(adapter->name, sizeof(adapter->name), "smu %d",
> + pmac_i2c_get_channel(bus));
> break;
> default:
> return -EINVAL;
> }
> - snprintf(adapter->name, sizeof(adapter->name), "%s %d", basename,
> - pmac_i2c_get_channel(bus));
> - of_node_put(parent);
>
> platform_set_drvdata(dev, adapter);
> adapter->algo = &i2c_powermac_algorithm;
> diff --git a/drivers/i2c/muxes/i2c-mux-gpmux.c b/drivers/i2c/muxes/i2c-mux-gpmux.c
> index 92cf5f48afe6..f60b670deff7 100644
> --- a/drivers/i2c/muxes/i2c-mux-gpmux.c
> +++ b/drivers/i2c/muxes/i2c-mux-gpmux.c
> @@ -120,8 +120,8 @@ static int i2c_mux_probe(struct platform_device *pdev)
>
> ret = of_property_read_u32(child, "reg", &chan);
> if (ret < 0) {
> - dev_err(dev, "no reg property for node '%s'\n",
> - child->name);
> + dev_err(dev, "no reg property for node '%pOFn'\n",
> + child);
> goto err_children;
> }
>
>
next prev parent reply other threads:[~2018-08-28 6:33 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20180828015252.28511-1-robh@kernel.org>
2018-08-28 1:52 ` [PATCH] powerpc: Convert to using %pOFn instead of device_node.name Rob Herring
2018-10-04 6:14 ` Michael Ellerman
2018-08-28 1:52 ` [PATCH] i2c: " Rob Herring
2018-08-28 6:33 ` Peter Rosin [this message]
2018-08-29 18:42 ` Rob Herring
2018-08-29 19:52 ` Peter Rosin
2018-08-30 0:49 ` Rob Herring
2018-08-28 1:52 ` [PATCH] macintosh: " Rob Herring
2018-08-28 1:52 ` [PATCH] misc: " Rob Herring
2018-08-28 2:35 ` Andrew Donnellan
2018-08-28 1:52 ` [PATCH] soc: " Rob Herring
2018-08-28 10:44 ` Thierry Reding
2018-08-28 18:48 ` Li Yang
2018-08-28 22:14 ` Tyrel Datwyler
2018-08-28 22:29 ` Li Yang
2018-08-28 22:46 ` Tyrel Datwyler
2018-08-29 8:21 ` Heiko Stübner
2018-08-29 8:57 ` Qiang Zhao
2018-09-30 17:08 ` Andy Gross
2018-08-28 1:52 ` [PATCH] tty: " Rob Herring
2018-09-28 22:09 ` Rob Herring
2018-09-28 22:32 ` Rob Herring
2018-08-28 1:52 ` [PATCH] sound: " Rob Herring
2018-08-28 7:54 ` Andy Shevchenko
2018-08-28 15:44 ` [PATCH v2] " Rob Herring
2018-09-03 21:45 ` [alsa-devel] " Takashi Iwai
2018-08-28 1:52 ` [PATCH] ASoC: " Rob Herring
2018-08-28 7:57 ` Andy Shevchenko
2018-08-28 15:44 ` [PATCH v2] " Rob Herring
2018-08-28 18:03 ` Mark Brown
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=3fa33583-f748-1708-2274-0a6f4e81004b@axentia.se \
--to=peda@axentia.se \
--cc=benh@kernel.crashing.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=robh@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).