From: Andre Przywara <andre.przywara@arm.com>
To: Rob Herring <robh@kernel.org>
Cc: Sean Wang <sean.wang@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Tony Lindgren <tony@atomide.com>,
Haojian Zhuang <haojian.zhuang@linaro.org>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>,
devicetree@vger.kernel.org, linux-mediatek@lists.infradead.org,
linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-renesas-soc@vger.kernel.org, linux-sunxi@lists.linux.dev
Subject: Re: [PATCH] pinctrl: Use of_property_present() for testing DT property presence
Date: Mon, 13 Mar 2023 10:17:51 +0000 [thread overview]
Message-ID: <20230313101751.18003b2d@slackpad.lan> (raw)
In-Reply-To: <20230310144721.1544669-1-robh@kernel.org>
On Fri, 10 Mar 2023 08:47:20 -0600
Rob Herring <robh@kernel.org> wrote:
> It is preferred to use typed property access functions (i.e.
> of_property_read_<type> functions) rather than low-level
> of_get_property/of_find_property functions for reading properties. As
> part of this, convert of_get_property/of_find_property calls to the
> recently added of_property_present() helper when we just want to test
> for presence of a property and nothing more.
>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
> drivers/pinctrl/mediatek/pinctrl-moore.c | 2 +-
> drivers/pinctrl/pinctrl-single.c | 4 ++--
> drivers/pinctrl/pinctrl-stmfx.c | 2 +-
> drivers/pinctrl/renesas/pinctrl.c | 4 ++--
> drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +-
> drivers/pinctrl/sunxi/pinctrl-sunxi.c | 20 ++++++++++----------
For sunxi: Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Cheers,
Andre
> 6 files changed, 17 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c
> index 007b98ce5631..8649a2f9d324 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-moore.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-moore.c
> @@ -586,7 +586,7 @@ static int mtk_build_gpiochip(struct mtk_pinctrl *hw)
> * Documentation/devicetree/bindings/gpio/gpio.txt on how to
> * bind pinctrl and gpio drivers via the "gpio-ranges" property.
> */
> - if (!of_find_property(hw->dev->of_node, "gpio-ranges", NULL)) {
> + if (!of_property_present(hw->dev->of_node, "gpio-ranges")) {
> ret = gpiochip_add_pin_range(chip, dev_name(hw->dev), 0, 0,
> chip->ngpio);
> if (ret < 0) {
> diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
> index 190923757cda..0dabbcf68b9f 100644
> --- a/drivers/pinctrl/pinctrl-single.c
> +++ b/drivers/pinctrl/pinctrl-single.c
> @@ -939,11 +939,11 @@ static int pcs_parse_pinconf(struct pcs_device *pcs, struct device_node *np,
>
> /* cacluate how much properties are supported in current node */
> for (i = 0; i < ARRAY_SIZE(prop2); i++) {
> - if (of_find_property(np, prop2[i].name, NULL))
> + if (of_property_present(np, prop2[i].name))
> nconfs++;
> }
> for (i = 0; i < ARRAY_SIZE(prop4); i++) {
> - if (of_find_property(np, prop4[i].name, NULL))
> + if (of_property_present(np, prop4[i].name))
> nconfs++;
> }
> if (!nconfs)
> diff --git a/drivers/pinctrl/pinctrl-stmfx.c b/drivers/pinctrl/pinctrl-stmfx.c
> index 1181c4b506b1..3c031692e44d 100644
> --- a/drivers/pinctrl/pinctrl-stmfx.c
> +++ b/drivers/pinctrl/pinctrl-stmfx.c
> @@ -632,7 +632,7 @@ static int stmfx_pinctrl_probe(struct platform_device *pdev)
> pctl->dev = &pdev->dev;
> pctl->stmfx = stmfx;
>
> - if (!of_find_property(np, "gpio-ranges", NULL)) {
> + if (!of_property_present(np, "gpio-ranges")) {
> dev_err(pctl->dev, "missing required gpio-ranges property\n");
> return -EINVAL;
> }
> diff --git a/drivers/pinctrl/renesas/pinctrl.c b/drivers/pinctrl/renesas/pinctrl.c
> index b74147800319..5c71e168b370 100644
> --- a/drivers/pinctrl/renesas/pinctrl.c
> +++ b/drivers/pinctrl/renesas/pinctrl.c
> @@ -125,8 +125,8 @@ static int sh_pfc_dt_subnode_to_map(struct pinctrl_dev *pctldev,
> * inside a subnode nor across subnodes.
> */
> if (!pmx->func_prop_name) {
> - if (of_find_property(np, "groups", NULL) ||
> - of_find_property(np, "pins", NULL)) {
> + if (of_property_present(np, "groups")||
> + of_property_present(np, "pins")) {
> pmx->func_prop_name = "function";
> pmx->groups_prop_name = "groups";
> pmx->pins_prop_name = "pins";
> diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
> index cb33a23ab0c1..66a25becd8f5 100644
> --- a/drivers/pinctrl/stm32/pinctrl-stm32.c
> +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
> @@ -1374,7 +1374,7 @@ static struct irq_domain *stm32_pctrl_get_irq_domain(struct platform_device *pde
> struct device_node *parent;
> struct irq_domain *domain;
>
> - if (!of_find_property(np, "interrupt-parent", NULL))
> + if (!of_property_present(np, "interrupt-parent"))
> return NULL;
>
> parent = of_irq_find_parent(np);
> diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> index f35179eceb4e..1dc1882cbdd7 100644
> --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
> @@ -224,16 +224,16 @@ static int sunxi_pctrl_get_group_pins(struct pinctrl_dev *pctldev,
>
> static bool sunxi_pctrl_has_bias_prop(struct device_node *node)
> {
> - return of_find_property(node, "bias-pull-up", NULL) ||
> - of_find_property(node, "bias-pull-down", NULL) ||
> - of_find_property(node, "bias-disable", NULL) ||
> - of_find_property(node, "allwinner,pull", NULL);
> + return of_property_present(node, "bias-pull-up") ||
> + of_property_present(node, "bias-pull-down") ||
> + of_property_present(node, "bias-disable") ||
> + of_property_present(node, "allwinner,pull");
> }
>
> static bool sunxi_pctrl_has_drive_prop(struct device_node *node)
> {
> - return of_find_property(node, "drive-strength", NULL) ||
> - of_find_property(node, "allwinner,drive", NULL);
> + return of_property_present(node, "drive-strength") ||
> + of_property_present(node, "allwinner,drive");
> }
>
> static int sunxi_pctrl_parse_bias_prop(struct device_node *node)
> @@ -241,13 +241,13 @@ static int sunxi_pctrl_parse_bias_prop(struct device_node *node)
> u32 val;
>
> /* Try the new style binding */
> - if (of_find_property(node, "bias-pull-up", NULL))
> + if (of_property_present(node, "bias-pull-up"))
> return PIN_CONFIG_BIAS_PULL_UP;
>
> - if (of_find_property(node, "bias-pull-down", NULL))
> + if (of_property_present(node, "bias-pull-down"))
> return PIN_CONFIG_BIAS_PULL_DOWN;
>
> - if (of_find_property(node, "bias-disable", NULL))
> + if (of_property_present(node, "bias-disable"))
> return PIN_CONFIG_BIAS_DISABLE;
>
> /* And fall back to the old binding */
> @@ -1424,7 +1424,7 @@ static int sunxi_pinctrl_setup_debounce(struct sunxi_pinctrl *pctl,
> return 0;
>
> /* If we don't have any setup, bail out */
> - if (!of_find_property(node, "input-debounce", NULL))
> + if (!of_property_present(node, "input-debounce"))
> return 0;
>
> losc = devm_clk_get(pctl->dev, "losc");
next prev parent reply other threads:[~2023-03-13 10:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-10 14:47 [PATCH] pinctrl: Use of_property_present() for testing DT property presence Rob Herring
2023-03-13 8:44 ` AngeloGioacchino Del Regno
2023-03-13 9:00 ` Geert Uytterhoeven
2023-03-13 11:00 ` Geert Uytterhoeven
2023-03-19 20:55 ` Linus Walleij
2023-03-20 8:01 ` Geert Uytterhoeven
2023-03-20 18:17 ` Rob Herring
2023-03-23 8:29 ` Linus Walleij
2023-03-13 10:17 ` Andre Przywara [this message]
2023-03-14 20:01 ` Jernej Škrabec
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=20230313101751.18003b2d@slackpad.lan \
--to=andre.przywara@arm.com \
--cc=alexandre.torgue@foss.st.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=geert+renesas@glider.be \
--cc=haojian.zhuang@linaro.org \
--cc=jernej.skrabec@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-sunxi@lists.linux.dev \
--cc=matthias.bgg@gmail.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=robh@kernel.org \
--cc=samuel@sholland.org \
--cc=sean.wang@kernel.org \
--cc=tony@atomide.com \
--cc=wens@csie.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).