]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
memory: stm32-fmc2-ebi: simplify with dev_err_probe()
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Fri, 16 Aug 2024 10:54:30 +0000 (12:54 +0200)
committerKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Wed, 21 Aug 2024 11:23:33 +0000 (13:23 +0200)
dev_err_probe() combines 'return' and error code printing, thus code is
a bit simpler, even if it cannot actually defer.

Suggested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20240816-cleanup-h-of-node-put-memory-v2-6-9eed0ee16b78@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
drivers/memory/stm32-fmc2-ebi.c

index 7167e1da56d325b22fa312183c37df85d4ca07be..566c225f71c06e9435cfefee0caa5d82de1dab68 100644 (file)
@@ -1579,11 +1579,8 @@ static int stm32_fmc2_ebi_parse_dt(struct stm32_fmc2_ebi *ebi)
 
        for_each_available_child_of_node_scoped(dev->of_node, child) {
                ret = of_property_read_u32(child, "reg", &bank);
-               if (ret) {
-                       dev_err(dev, "could not retrieve reg property: %d\n",
-                               ret);
-                       return ret;
-               }
+               if (ret)
+                       return dev_err_probe(dev, ret, "could not retrieve reg property\n");
 
                if (bank >= FMC2_MAX_BANKS) {
                        dev_err(dev, "invalid reg value: %d\n", bank);
@@ -1605,11 +1602,9 @@ static int stm32_fmc2_ebi_parse_dt(struct stm32_fmc2_ebi *ebi)
 
                if (bank < FMC2_MAX_EBI_CE) {
                        ret = stm32_fmc2_ebi_setup_cs(ebi, child, bank);
-                       if (ret) {
-                               dev_err(dev, "setup chip select %d failed: %d\n",
-                                       bank, ret);
-                               return ret;
-                       }
+                       if (ret)
+                               return dev_err_probe(dev, ret,
+                                                    "setup chip select %d failed\n", bank);
                }
 
                ebi->bank_assigned |= BIT(bank);