]> www.infradead.org Git - linux.git/commitdiff
spi: cadence-quadspi: Simplify with scoped for each OF child loop
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Wed, 14 Aug 2024 14:38:05 +0000 (16:38 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 14 Aug 2024 17:26:51 +0000 (18:26 +0100)
Use scoped for_each_available_child_of_node_scoped() when iterating over
device nodes to make code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20240814143805.98874-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-cadence-quadspi.c

index 05ebb03d319fcb92fb847f481ddf47e17aac020a..9c0a4fa5128aab3eced728102d33cd6a06096214 100644 (file)
@@ -1662,23 +1662,20 @@ static int cqspi_setup_flash(struct cqspi_st *cqspi)
        unsigned int max_cs = cqspi->num_chipselect - 1;
        struct platform_device *pdev = cqspi->pdev;
        struct device *dev = &pdev->dev;
-       struct device_node *np = dev->of_node;
        struct cqspi_flash_pdata *f_pdata;
        unsigned int cs;
        int ret;
 
        /* Get flash device data */
-       for_each_available_child_of_node(dev->of_node, np) {
+       for_each_available_child_of_node_scoped(dev->of_node, np) {
                ret = of_property_read_u32(np, "reg", &cs);
                if (ret) {
                        dev_err(dev, "Couldn't determine chip select.\n");
-                       of_node_put(np);
                        return ret;
                }
 
                if (cs >= cqspi->num_chipselect) {
                        dev_err(dev, "Chip select %d out of range.\n", cs);
-                       of_node_put(np);
                        return -EINVAL;
                } else if (cs < max_cs) {
                        max_cs = cs;
@@ -1689,10 +1686,8 @@ static int cqspi_setup_flash(struct cqspi_st *cqspi)
                f_pdata->cs = cs;
 
                ret = cqspi_of_get_flash_pdata(pdev, f_pdata, np);
-               if (ret) {
-                       of_node_put(np);
+               if (ret)
                        return ret;
-               }
        }
 
        cqspi->num_chipselect = max_cs + 1;