of: remove internal arguments from of_property_for_each_u32()

The of_property_for_each_u32() macro needs five parameters, two of which
are primarily meant as internal variables for the macro itself (in the
for() clause). Yet these two parameters are used by a few drivers, and this
can be considered misuse or at least bad practice.

Now that the kernel uses C11 to build, these two parameters can be avoided
by declaring them internally, thus changing this pattern:

  struct property *prop;
  const __be32 *p;
  u32 val;

  of_property_for_each_u32(np, "xyz", prop, p, val) { ... }

to this:

  u32 val;

  of_property_for_each_u32(np, "xyz", val) { ... }

However two variables cannot be declared in the for clause even with C11,
so declare one struct that contain the two variables we actually need. As
the variables inside this struct are not meant to be used by users of this
macro, give the struct instance the noticeable name "_it" so it is visible
during code reviews, helping to avoid new code to use it directly.

Most usages are trivially converted as they do not use those two
parameters, as expected. The non-trivial cases are:

 - drivers/clk/clk.c, of_clk_get_parent_name(): easily doable anyway
 - drivers/clk/clk-si5351.c, si5351_dt_parse(): this is more complex as the
   checks had to be replicated in a different way, making code more verbose
   and somewhat uglier, but I refrained from a full rework to keep as much
   of the original code untouched having no hardware to test my changes

All the changes have been build tested. The few for which I have the
hardware have been runtime-tested too.

Reviewed-by: Andre Przywara <andre.przywara@arm.com> # drivers/clk/sunxi/clk-simple-gates.c, drivers/clk/sunxi/clk-sun8i-bus-gates.c
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> # drivers/gpio/gpio-brcmstb.c
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> # drivers/irqchip/irq-atmel-aic-common.c
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> # drivers/iio/adc/ti_am335x_adc.c
Acked-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com> # drivers/pwm/pwm-samsung.c
Acked-by: Richard Leitner <richard.leitner@linux.dev> # drivers/usb/misc/usb251xb.c
Acked-by: Mark Brown <broonie@kernel.org> # sound/soc/codecs/arizona.c
Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com> # sound/soc/codecs/arizona.c
Acked-by: Michael Ellerman <mpe@ellerman.id.au> # arch/powerpc/sysdev/xive/spapr.c
Acked-by: Stephen Boyd <sboyd@kernel.org> # clk
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Acked-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20240724-of_property_for_each_u32-v3-1-bea82ce429e2@bootlin.com
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>

diff --git a/arch/powerpc/sysdev/xive/native.c b/arch/powerpc/sysdev/xive/native.c
index 517b963e3e6a19806c80369de3c4449d12688605..a0934b516933ea5d32b93de5b2089350dceb8cdf 100644 (file)
--- a/arch/powerpc/sysdev/xive/native.c
+++ b/arch/powerpc/sysdev/xive/native.c
@@ -559,9 +559,7 @@ bool __init xive_native_init(void)
        struct device_node *np;
        struct resource r;
        void __iomem *tima;
-       struct property *prop;
        u8 max_prio = 7;
-       const __be32 *p;
        u32 val, cpu;
        s64 rc;
 
@@ -592,7 +590,7 @@ bool __init xive_native_init(void)
                max_prio = val - 1;
 
        /* Iterate the EQ sizes and pick one */
-       of_property_for_each_u32(np, "ibm,xive-eq-sizes", prop, p, val) {
+       of_property_for_each_u32(np, "ibm,xive-eq-sizes", val) {
                xive_queue_shift = val;
                if (val == PAGE_SHIFT)
                        break;

diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c
index e454192643910075d3e501382453aba8ee0fae08..f2fa985a2c77128c5279a3038011f797611d8589 100644 (file)
--- a/arch/powerpc/sysdev/xive/spapr.c
+++ b/arch/powerpc/sysdev/xive/spapr.c
@@ -814,7 +814,6 @@ bool __init xive_spapr_init(void)
        struct device_node *np;
        struct resource r;
        void __iomem *tima;
-       struct property *prop;
        u8 max_prio;
        u32 val;
        u32 len;
@@ -866,7 +865,7 @@ bool __init xive_spapr_init(void)
        }
 
        /* Iterate the EQ sizes and pick one */
-       of_property_for_each_u32(np, "ibm,xive-eq-sizes", prop, reg, val) {
+       of_property_for_each_u32(np, "ibm,xive-eq-sizes", val) {
                xive_queue_shift = val;
                if (val == PAGE_SHIFT)
                        break;

diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index 8767e04d6c89738b21f1fbf091bd8f77f1c431ae..2b59ef61dda23b77243693be2c33bc02effdb2a5 100644 (file)
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -2291,11 +2291,9 @@ static int sysc_init_idlemode(struct sysc *ddata, u8 *idlemodes,
                              const char *name)
 {
        struct device_node *np = ddata->dev->of_node;
-       struct property *prop;
-       const __be32 *p;
        u32 val;
 
-       of_property_for_each_u32(np, name, prop, p, val) {
+       of_property_for_each_u32(np, name, val) {
                if (val >= SYSC_NR_IDLEMODES) {
                        dev_err(ddata->dev, "invalid idlemode: %i\n", val);
                        return -EINVAL;

diff --git a/drivers/clk/clk-conf.c b/drivers/clk/clk-conf.c
index 1a4e6340f95ce4c276bc7df61c7c2590e0ad1d99..058420562020791865e69cfce3ee4771bab8cd93 100644 (file)
--- a/drivers/clk/clk-conf.c
+++ b/drivers/clk/clk-conf.c
@@ -81,13 +81,11 @@ err:
 static int __set_clk_rates(struct device_node *node, bool clk_supplier)
 {
        struct of_phandle_args clkspec;
-       struct property *prop;
-       const __be32 *cur;
        int rc, index = 0;
        struct clk *clk;
        u32 rate;
 
-       of_property_for_each_u32(node, "assigned-clock-rates", prop, cur, rate) {
+       of_property_for_each_u32(node, "assigned-clock-rates", rate) {
                if (rate) {
                        rc = of_parse_phandle_with_args(node, "assigned-clocks",
                                        "#clock-cells", index, &clkspec);

diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c
index 4ce83c5265b878b97aee9eedb669a44d4153dfb8..a4c92c5ef3ff749b5a07c8b86ee783307c73066d 100644 (file)
--- a/drivers/clk/clk-si5351.c
+++ b/drivers/clk/clk-si5351.c
@@ -1175,8 +1175,8 @@ static int si5351_dt_parse(struct i2c_client *client,
 {
        struct device_node *child, *np = client->dev.of_node;
        struct si5351_platform_data *pdata;
-       struct property *prop;
-       const __be32 *p;
+       u32 array[4];
+       int sz, i;
        int num = 0;
        u32 val;
 
@@ -1191,20 +1191,24 @@ static int si5351_dt_parse(struct i2c_client *client,
         * property silabs,pll-source : <num src>, [<..>]
         * allow to selectively set pll source
         */
-       of_property_for_each_u32(np, "silabs,pll-source", prop, p, num) {
+       sz = of_property_read_variable_u32_array(np, "silabs,pll-source", array, 2, 4);
+       sz = (sz == -EINVAL) ? 0 : sz; /* Missing property is OK */
+       if (sz < 0)
+               return dev_err_probe(&client->dev, sz, "invalid pll-source\n");
+       if (sz % 2)
+               return dev_err_probe(&client->dev, -EINVAL,
+                                    "missing pll-source for pll %d\n", array[sz - 1]);
+
+       for (i = 0; i < sz; i += 2) {
+               num = array[i];
+               val = array[i + 1];
+
                if (num >= 2) {
                        dev_err(&client->dev,
                                "invalid pll %d on pll-source prop\n", num);
                        return -EINVAL;
                }
 
-               p = of_prop_next_u32(prop, p, &val);
-               if (!p) {
-                       dev_err(&client->dev,
-                               "missing pll-source for pll %d\n", num);
-                       return -EINVAL;
-               }
-
                switch (val) {
                case 0:
                        pdata->pll_src[num] = SI5351_PLL_SRC_XTAL;
@@ -1232,19 +1236,24 @@ static int si5351_dt_parse(struct i2c_client *client,
        pdata->pll_reset[0] = true;
        pdata->pll_reset[1] = true;
 
-       of_property_for_each_u32(np, "silabs,pll-reset-mode", prop, p, num) {
+       sz = of_property_read_variable_u32_array(np, "silabs,pll-reset-mode", array, 2, 4);
+       sz = (sz == -EINVAL) ? 0 : sz; /* Missing property is OK */
+       if (sz < 0)
+               return dev_err_probe(&client->dev, sz, "invalid pll-reset-mode\n");
+       if (sz % 2)
+               return dev_err_probe(&client->dev, -EINVAL,
+                                    "missing pll-reset-mode for pll %d\n", array[sz - 1]);
+
+       for (i = 0; i < sz; i += 2) {
+               num = array[i];
+               val = array[i + 1];
+
                if (num >= 2) {
                        dev_err(&client->dev,
                                "invalid pll %d on pll-reset-mode prop\n", num);
                        return -EINVAL;
                }
 
-               p = of_prop_next_u32(prop, p, &val);
-               if (!p) {
-                       dev_err(&client->dev,
-                               "missing pll-reset-mode for pll %d\n", num);
-                       return -EINVAL;
-               }
 
                switch (val) {
                case 0:

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 8cca52be993f4c831660f0c0d13bac290a37e4de..285ed1ad8a37807e9f1f8a77b53c4cc996a8c27f 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -5364,9 +5364,8 @@ EXPORT_SYMBOL_GPL(of_clk_get_parent_count);
 const char *of_clk_get_parent_name(const struct device_node *np, int index)
 {
        struct of_phandle_args clkspec;
-       struct property *prop;
        const char *clk_name;
-       const __be32 *vp;
+       bool found = false;
        u32 pv;
        int rc;
        int count;
@@ -5383,15 +5382,16 @@ const char *of_clk_get_parent_name(const struct device_node *np, int index)
        /* if there is an indices property, use it to transfer the index
         * specified into an array offset for the clock-output-names property.
         */
-       of_property_for_each_u32(clkspec.np, "clock-indices", prop, vp, pv) {
+       of_property_for_each_u32(clkspec.np, "clock-indices", pv) {
                if (index == pv) {
                        index = count;
+                       found = true;
                        break;
                }
                count++;
        }
        /* We went off the end of 'clock-indices' without finding it */
-       if (prop && !vp)
+       if (of_property_present(clkspec.np, "clock-indices") && !found)
                return NULL;
 
        if (of_property_read_string_index(clkspec.np, "clock-output-names",
@@ -5504,14 +5504,12 @@ static int parent_ready(struct device_node *np)
 int of_clk_detect_critical(struct device_node *np, int index,
                           unsigned long *flags)
 {
-       struct property *prop;
-       const __be32 *cur;
        uint32_t idx;
 
        if (!np || !flags)
                return -EINVAL;
 
-       of_property_for_each_u32(np, "clock-critical", prop, cur, idx)
+       of_property_for_each_u32(np, "clock-critical", idx)
                if (index == idx)
                        *flags |= CLK_IS_CRITICAL;
 

diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c
index ea3788ba46f7e6e18a3a39070410318f5b60ded5..33cc1f73c69d1f875a193aea0552902268dc8716 100644 (file)
--- a/drivers/clk/qcom/common.c
+++ b/drivers/clk/qcom/common.c
@@ -227,11 +227,9 @@ EXPORT_SYMBOL_GPL(qcom_cc_register_sleep_clk);
 static void qcom_cc_drop_protected(struct device *dev, struct qcom_cc *cc)
 {
        struct device_node *np = dev->of_node;
-       struct property *prop;
-       const __be32 *p;
        u32 i;
 
-       of_property_for_each_u32(np, "protected-clocks", prop, p, i) {
+       of_property_for_each_u32(np, "protected-clocks", i) {
                if (i >= cc->num_rclks)
                        continue;
 

diff --git a/drivers/clk/sunxi/clk-simple-gates.c b/drivers/clk/sunxi/clk-simple-gates.c
index 0399627c226a68838a82ba219d497fbf4e2c7a5e..845efc1ec800b990d216e93e39a716eb890f0f2b 100644 (file)
--- a/drivers/clk/sunxi/clk-simple-gates.c
+++ b/drivers/clk/sunxi/clk-simple-gates.c
@@ -21,11 +21,9 @@ static void __init sunxi_simple_gates_setup(struct device_node *node,
 {
        struct clk_onecell_data *clk_data;
        const char *clk_parent, *clk_name;
-       struct property *prop;
        struct resource res;
        void __iomem *clk_reg;
        void __iomem *reg;
-       const __be32 *p;
        int number, i = 0, j;
        u8 clk_bit;
        u32 index;
@@ -47,7 +45,7 @@ static void __init sunxi_simple_gates_setup(struct device_node *node,
        if (!clk_data->clks)
                goto err_free_data;
 
-       of_property_for_each_u32(node, "clock-indices", prop, p, index) {
+       of_property_for_each_u32(node, "clock-indices", index) {
                of_property_read_string_index(node, "clock-output-names",
                                              i, &clk_name);
 

diff --git a/drivers/clk/sunxi/clk-sun8i-bus-gates.c b/drivers/clk/sunxi/clk-sun8i-bus-gates.c
index b87f331f63c9e882e81e21285a0a181a0a69038d..8482ac8e5898a09dcd72f6ae21790c097077095d 100644 (file)
--- a/drivers/clk/sunxi/clk-sun8i-bus-gates.c
+++ b/drivers/clk/sunxi/clk-sun8i-bus-gates.c
@@ -24,11 +24,9 @@ static void __init sun8i_h3_bus_gates_init(struct device_node *node)
        const char *parents[PARENT_MAX];
        struct clk_onecell_data *clk_data;
        const char *clk_name;
-       struct property *prop;
        struct resource res;
        void __iomem *clk_reg;
        void __iomem *reg;
-       const __be32 *p;
        int number, i;
        u8 clk_bit;
        int index;
@@ -58,7 +56,7 @@ static void __init sun8i_h3_bus_gates_init(struct device_node *node)
                goto err_free_data;
 
        i = 0;
-       of_property_for_each_u32(node, "clock-indices", prop, p, index) {
+       of_property_for_each_u32(node, "clock-indices", index) {
                of_property_read_string_index(node, "clock-output-names",
                                              i, &clk_name);
 

diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c
index 6e46781bc9acff9e8fd4f4bfcff27d5d7d7b0eb3..b9561e3f196c42d2b5bae7d56a94b0ee87a47a5a 100644 (file)
--- a/drivers/clocksource/samsung_pwm_timer.c
+++ b/drivers/clocksource/samsung_pwm_timer.c
@@ -418,8 +418,6 @@ void __init samsung_pwm_clocksource_init(void __iomem *base,
 static int __init samsung_pwm_alloc(struct device_node *np,
                                    const struct samsung_pwm_variant *variant)
 {
-       struct property *prop;
-       const __be32 *cur;
        u32 val;
        int i, ret;
 
@@ -427,7 +425,7 @@ static int __init samsung_pwm_alloc(struct device_node *np,
        for (i = 0; i < SAMSUNG_PWM_NUM; ++i)
                pwm.irq[i] = irq_of_parse_and_map(np, i);
 
-       of_property_for_each_u32(np, "samsung,pwm-outputs", prop, cur, val) {
+       of_property_for_each_u32(np, "samsung,pwm-outputs", val) {
                if (val >= SAMSUNG_PWM_NUM) {
                        pr_warn("%s: invalid channel index in samsung,pwm-outputs property\n", __func__);
                        continue;

diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c
index 8dce78ea71395d56a92c179a35b50bd8c054617f..5762e517338eea0e4ee4bf2f2ed1261d0d2a7938 100644 (file)
--- a/drivers/gpio/gpio-brcmstb.c
+++ b/drivers/gpio/gpio-brcmstb.c
@@ -591,8 +591,6 @@ static int brcmstb_gpio_probe(struct platform_device *pdev)
        void __iomem *reg_base;
        struct brcmstb_gpio_priv *priv;
        struct resource *res;
-       struct property *prop;
-       const __be32 *p;
        u32 bank_width;
        int num_banks = 0;
        int num_gpios = 0;
@@ -636,8 +634,7 @@ static int brcmstb_gpio_probe(struct platform_device *pdev)
        flags = BGPIOF_BIG_ENDIAN_BYTE_ORDER;
 #endif
 
-       of_property_for_each_u32(np, "brcm,gpio-bank-widths", prop, p,
-                       bank_width) {
+       of_property_for_each_u32(np, "brcm,gpio-bank-widths", bank_width) {
                struct brcmstb_gpio_bank *bank;
                struct gpio_chip *gc;
 

diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 95fa857e8aadfe3a88d9db85fd70940ff7c624ed..426e3c9f88a16ee6c60f85fef6ef6a95a9ee97e1 100644 (file)
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -564,13 +564,11 @@ static int tiadc_parse_dt(struct platform_device *pdev,
                          struct tiadc_device *adc_dev)
 {
        struct device_node *node = pdev->dev.of_node;
-       struct property *prop;
-       const __be32 *cur;
        int channels = 0;
        u32 val;
        int i;
 
-       of_property_for_each_u32(node, "ti,adc-channels", prop, cur, val) {
+       of_property_for_each_u32(node, "ti,adc-channels", val) {
                adc_dev->channel_line[channels] = val;
 
                /* Set Default values for optional DT parameters */

diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-atmel-aic-common.c
index 072bd227b6c677b40fee80f99e1364d733e681a3..4525366d16d6152886379273391f56ad45149f37 100644 (file)
--- a/drivers/irqchip/irq-atmel-aic-common.c
+++ b/drivers/irqchip/irq-atmel-aic-common.c
@@ -111,8 +111,6 @@ static void __init aic_common_ext_irq_of_init(struct irq_domain *domain)
        struct device_node *node = irq_domain_get_of_node(domain);
        struct irq_chip_generic *gc;
        struct aic_chip_data *aic;
-       struct property *prop;
-       const __be32 *p;
        u32 hwirq;
 
        gc = irq_get_domain_generic_chip(domain, 0);
@@ -120,7 +118,7 @@ static void __init aic_common_ext_irq_of_init(struct irq_domain *domain)
        aic = gc->private;
        aic->ext_irqs |= 1;
 
-       of_property_for_each_u32(node, "atmel,external-irqs", prop, p, hwirq) {
+       of_property_for_each_u32(node, "atmel,external-irqs", hwirq) {
                gc = irq_get_domain_generic_chip(domain, hwirq);
                if (!gc) {
                        pr_warn("AIC: external irq %d >= %d skip it\n",

diff --git a/drivers/irqchip/irq-pic32-evic.c b/drivers/irqchip/irq-pic32-evic.c
index 1d9bb28d13e5d95c93085533938382825cea7a07..5d6b8e025bb8769bd0d39cb979f0e1ee6949c07c 100644 (file)
--- a/drivers/irqchip/irq-pic32-evic.c
+++ b/drivers/irqchip/irq-pic32-evic.c
@@ -190,13 +190,11 @@ static void __init pic32_ext_irq_of_init(struct irq_domain *domain)
 {
        struct device_node *node = irq_domain_get_of_node(domain);
        struct evic_chip_data *priv = domain->host_data;
-       struct property *prop;
-       const __le32 *p;
        u32 hwirq;
        int i = 0;
        const char *pname = "microchip,external-irqs";
 
-       of_property_for_each_u32(node, pname, prop, p, hwirq) {
+       of_property_for_each_u32(node, pname, hwirq) {
                if (i >= ARRAY_SIZE(priv->ext_irqs)) {
                        pr_warn("More than %d external irq, skip rest\n",
                                ARRAY_SIZE(priv->ext_irqs));

diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index 4bbd542d753e4d89272924c5e097c0a2a6d885cf..0c1364d88469f53c1486d5119c7451e75c80b86b 100644 (file)
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -119,8 +119,6 @@ static      int ti_tscadc_probe(struct platform_device *pdev)
        struct clk *clk;
        struct device_node *node;
        struct mfd_cell *cell;
-       struct property *prop;
-       const __be32 *cur;
        bool use_tsc = false, use_mag = false;
        u32 val;
        int err;
@@ -167,7 +165,7 @@ static      int ti_tscadc_probe(struct platform_device *pdev)
        }
 
        node = of_get_child_by_name(pdev->dev.of_node, "adc");
-       of_property_for_each_u32(node, "ti,adc-channels", prop, cur, val) {
+       of_property_for_each_u32(node, "ti,adc-channels", val) {
                adc_channels++;
                if (val > 7) {
                        dev_err(&pdev->dev, " PIN numbers are 0..7 (not %d)\n",

diff --git a/drivers/pinctrl/nxp/pinctrl-s32cc.c b/drivers/pinctrl/nxp/pinctrl-s32cc.c
index df3e5d82da4b3de934bb2abe26aba208ba2ef452..f2609a35c312c87af69752630debbbec65d4ad4d 100644 (file)
--- a/drivers/pinctrl/nxp/pinctrl-s32cc.c
+++ b/drivers/pinctrl/nxp/pinctrl-s32cc.c
@@ -730,9 +730,7 @@ static int s32_pinctrl_parse_groups(struct device_node *np,
                                     struct s32_pin_group *grp,
                                     struct s32_pinctrl_soc_info *info)
 {
-       const __be32 *p;
        struct device *dev;
-       struct property *prop;
        unsigned int *pins, *sss;
        int i, npins;
        u32 pinmux;
@@ -763,7 +761,7 @@ static int s32_pinctrl_parse_groups(struct device_node *np,
                return -ENOMEM;
 
        i = 0;
-       of_property_for_each_u32(np, "pinmux", prop, p, pinmux) {
+       of_property_for_each_u32(np, "pinmux", pinmux) {
                pins[i] = get_pin_no(pinmux);
                sss[i] = get_pin_func(pinmux);
 

diff --git a/drivers/pinctrl/pinctrl-k210.c b/drivers/pinctrl/pinctrl-k210.c
index 2753e14c3e38a95ffd7a1edf8e957162dbad5458..a898e40451fe4baceedbae2a0e7f498e29d9a379 100644 (file)
--- a/drivers/pinctrl/pinctrl-k210.c
+++ b/drivers/pinctrl/pinctrl-k210.c
@@ -763,8 +763,6 @@ static int k210_pinctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
                                          unsigned int *reserved_maps,
                                          unsigned int *num_maps)
 {
-       struct property *prop;
-       const __be32 *p;
        int ret, pinmux_groups;
        u32 pinmux_group;
        unsigned long *configs = NULL;
@@ -797,7 +795,7 @@ static int k210_pinctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,
        if (ret < 0)
                goto exit;
 
-       of_property_for_each_u32(np, "pinmux", prop, p, pinmux_group) {
+       of_property_for_each_u32(np, "pinmux", pinmux_group) {
                const char *group_name, *func_name;
                u32 pin = FIELD_GET(K210_PG_PIN, pinmux_group);
                u32 func = FIELD_GET(K210_PG_FUNC, pinmux_group);

diff --git a/drivers/pwm/pwm-samsung.c b/drivers/pwm/pwm-samsung.c
index 7adf4f2b1049a4a51cedab46bf41263b7f8607fd..951b38ff5f8ecb738c466d71a6d399b8f53b5c41 100644 (file)
--- a/drivers/pwm/pwm-samsung.c
+++ b/drivers/pwm/pwm-samsung.c
@@ -510,8 +510,6 @@ static int pwm_samsung_parse_dt(struct pwm_chip *chip)
        struct samsung_pwm_chip *our_chip = to_samsung_pwm_chip(chip);
        struct device_node *np = pwmchip_parent(chip)->of_node;
        const struct of_device_id *match;
-       struct property *prop;
-       const __be32 *cur;
        u32 val;
 
        match = of_match_node(samsung_pwm_matches, np);
@@ -520,7 +518,7 @@ static int pwm_samsung_parse_dt(struct pwm_chip *chip)
 
        memcpy(&our_chip->variant, match->data, sizeof(our_chip->variant));
 
-       of_property_for_each_u32(np, "samsung,pwm-outputs", prop, cur, val) {
+       of_property_for_each_u32(np, "samsung,pwm-outputs", val) {
                if (val >= SAMSUNG_PWM_NUM) {
                        dev_err(pwmchip_parent(chip),
                                "%s: invalid channel index in samsung,pwm-outputs property\n",

diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index e5974b8239c9904abbc15c1b658380bd800426b8..dab3326810360db4f287426a5a2a084d1d293b12 100644 (file)
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -770,8 +770,6 @@ static void sysrq_of_get_keyreset_config(void)
 {
        u32 key;
        struct device_node *np;
-       struct property *prop;
-       const __be32 *p;
 
        np = of_find_node_by_path("/chosen/linux,sysrq-reset-seq");
        if (!np) {
@@ -782,7 +780,7 @@ static void sysrq_of_get_keyreset_config(void)
        /* Reset in case a __weak definition was present */
        sysrq_reset_seq_len = 0;
 
-       of_property_for_each_u32(np, "keyset", prop, p, key) {
+       of_property_for_each_u32(np, "keyset", key) {
                if (key == KEY_RESERVED || key > KEY_MAX ||
                    sysrq_reset_seq_len == SYSRQ_KEY_RESET_MAX)
                        break;

diff --git a/drivers/usb/misc/usb251xb.c b/drivers/usb/misc/usb251xb.c
index b98cda1cef7322da4f6825d4b297d522ddfed876..e24cdb667307802b9eee856e20744ebf694395e8 100644 (file)
--- a/drivers/usb/misc/usb251xb.c
+++ b/drivers/usb/misc/usb251xb.c
@@ -382,11 +382,9 @@ static void usb251xb_get_ports_field(struct usb251xb *hub,
                                    bool ds_only, u8 *fld)
 {
        struct device *dev = hub->dev;
-       struct property *prop;
-       const __be32 *p;
        u32 port;
 
-       of_property_for_each_u32(dev->of_node, prop_name, prop, p, port) {
+       of_property_for_each_u32(dev->of_node, prop_name, port) {
                if ((port >= ds_only ? 1 : 0) && (port <= port_cnt))
                        *fld |= BIT(port);
                else

diff --git a/include/linux/of.h b/include/linux/of.h
index 13cf7a43b47338aa8c18cac62491b1d8c83eda5a..85b60ac9eec50bb202aa774cab273e1d947e394d 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -430,11 +430,9 @@ extern int of_detach_node(struct device_node *);
 #define of_match_ptr(_ptr)     (_ptr)
 
 /*
- * struct property *prop;
- * const __be32 *p;
  * u32 u;
  *
- * of_property_for_each_u32(np, "propname", prop, p, u)
+ * of_property_for_each_u32(np, "propname", u)
  *         printk("U32 value: %x\n", u);
  */
 const __be32 *of_prop_next_u32(struct property *prop, const __be32 *cur,
@@ -1431,11 +1429,12 @@ static inline int of_property_read_s32(const struct device_node *np,
             err == 0;                                                  \
             err = of_phandle_iterator_next(it))
 
-#define of_property_for_each_u32(np, propname, prop, p, u)     \
-       for (prop = of_find_property(np, propname, NULL),       \
-               p = of_prop_next_u32(prop, NULL, &u);           \
-               p;                                              \
-               p = of_prop_next_u32(prop, p, &u))
+#define of_property_for_each_u32(np, propname, u)                      \
+       for (struct {struct property *prop; const __be32 *item; } _it = \
+               {of_find_property(np, propname, NULL),                  \
+                of_prop_next_u32(_it.prop, NULL, &u)};                 \
+            _it.item;                                                  \
+            _it.item = of_prop_next_u32(_it.prop, _it.item, &u))
 
 #define of_property_for_each_string(np, propname, prop, s)     \
        for (prop = of_find_property(np, propname, NULL),       \

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 7434aeeda292ec218faebdaa04011520842cb0ef..402b9a2ff02406a91440414e6a983a3e1c36972f 100644 (file)
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -2786,15 +2786,13 @@ int arizona_of_get_audio_pdata(struct arizona *arizona)
 {
        struct arizona_pdata *pdata = &arizona->pdata;
        struct device_node *np = arizona->dev->of_node;
-       struct property *prop;
-       const __be32 *cur;
        u32 val;
        u32 pdm_val[ARIZONA_MAX_PDM_SPK];
        int ret;
        int count = 0;
 
        count = 0;
-       of_property_for_each_u32(np, "wlf,inmode", prop, cur, val) {
+       of_property_for_each_u32(np, "wlf,inmode", val) {
                if (count == ARRAY_SIZE(pdata->inmode))
                        break;
 
@@ -2803,7 +2801,7 @@ int arizona_of_get_audio_pdata(struct arizona *arizona)
        }
 
        count = 0;
-       of_property_for_each_u32(np, "wlf,dmic-ref", prop, cur, val) {
+       of_property_for_each_u32(np, "wlf,dmic-ref", val) {
                if (count == ARRAY_SIZE(pdata->dmic_ref))
                        break;
 
@@ -2812,7 +2810,7 @@ int arizona_of_get_audio_pdata(struct arizona *arizona)
        }
 
        count = 0;
-       of_property_for_each_u32(np, "wlf,out-mono", prop, cur, val) {
+       of_property_for_each_u32(np, "wlf,out-mono", val) {
                if (count == ARRAY_SIZE(pdata->out_mono))
                        break;
 
@@ -2821,7 +2819,7 @@ int arizona_of_get_audio_pdata(struct arizona *arizona)
        }
 
        count = 0;
-       of_property_for_each_u32(np, "wlf,max-channels-clocked", prop, cur, val) {
+       of_property_for_each_u32(np, "wlf,max-channels-clocked", val) {
                if (count == ARRAY_SIZE(pdata->max_channels_clocked))
                        break;
 
@@ -2830,7 +2828,7 @@ int arizona_of_get_audio_pdata(struct arizona *arizona)
        }
 
        count = 0;
-       of_property_for_each_u32(np, "wlf,out-volume-limit", prop, cur, val) {
+       of_property_for_each_u32(np, "wlf,out-volume-limit", val) {
                if (count == ARRAY_SIZE(pdata->out_vol_limit))
                        break;