iio: dac: ad3552: Use __free(fwnode_handle) to simplify error handling.

By using this scoped based cleanup direct returns on errors are enabled
simplifying the code.

Cc: Mihail Chindris <mihail.chindris@analog.com>
Cc: Marcelo Schmitt <marcelo.schmitt1@gmail.com>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20240330190849.1321065-8-jic23@kernel.org
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/dac/ad3552r.c b/drivers/iio/dac/ad3552r.c
index e14a065b29cac4fda9d547fbf51722d9006ac5ff..8aa942896b5bc1f95b527ebbfceaa81d86411040 100644 (file)
--- a/drivers/iio/dac/ad3552r.c
+++ b/drivers/iio/dac/ad3552r.c
@@ -801,51 +801,45 @@ static int ad3552r_configure_custom_gain(struct ad3552r_desc *dac,
                                         u32 ch)
 {
        struct device *dev = &dac->spi->dev;
-       struct fwnode_handle *gain_child;
        u32 val;
        int err;
        u8 addr;
        u16 reg = 0, offset;
 
-       gain_child = fwnode_get_named_child_node(child,
-                                                "custom-output-range-config");
-       if (!gain_child) {
-               dev_err(dev,
-                       "mandatory custom-output-range-config property missing\n");
-               return -EINVAL;
-       }
+       struct fwnode_handle *gain_child __free(fwnode_handle)
+               = fwnode_get_named_child_node(child,
+                                             "custom-output-range-config");
+       if (!gain_child)
+               return dev_err_probe(dev, -EINVAL,
+                                    "mandatory custom-output-range-config property missing\n");
 
        dac->ch_data[ch].range_override = 1;
        reg |= ad3552r_field_prep(1, AD3552R_MASK_CH_RANGE_OVERRIDE);
 
        err = fwnode_property_read_u32(gain_child, "adi,gain-scaling-p", &val);
-       if (err) {
-               dev_err(dev, "mandatory adi,gain-scaling-p property missing\n");
-               goto put_child;
-       }
+       if (err)
+               return dev_err_probe(dev, err,
+                                    "mandatory adi,gain-scaling-p property missing\n");
        reg |= ad3552r_field_prep(val, AD3552R_MASK_CH_GAIN_SCALING_P);
        dac->ch_data[ch].p = val;
 
        err = fwnode_property_read_u32(gain_child, "adi,gain-scaling-n", &val);
-       if (err) {
-               dev_err(dev, "mandatory adi,gain-scaling-n property missing\n");
-               goto put_child;
-       }
+       if (err)
+               return dev_err_probe(dev, err,
+                                    "mandatory adi,gain-scaling-n property missing\n");
        reg |= ad3552r_field_prep(val, AD3552R_MASK_CH_GAIN_SCALING_N);
        dac->ch_data[ch].n = val;
 
        err = fwnode_property_read_u32(gain_child, "adi,rfb-ohms", &val);
-       if (err) {
-               dev_err(dev, "mandatory adi,rfb-ohms property missing\n");
-               goto put_child;
-       }
+       if (err)
+               return dev_err_probe(dev, err,
+                                    "mandatory adi,rfb-ohms property missing\n");
        dac->ch_data[ch].rfb = val;
 
        err = fwnode_property_read_u32(gain_child, "adi,gain-offset", &val);
-       if (err) {
-               dev_err(dev, "mandatory adi,gain-offset property missing\n");
-               goto put_child;
-       }
+       if (err)
+               return dev_err_probe(dev, err,
+                                    "mandatory adi,gain-offset property missing\n");
        dac->ch_data[ch].gain_offset = val;
 
        offset = abs((s32)val);
@@ -855,21 +849,14 @@ static int ad3552r_configure_custom_gain(struct ad3552r_desc *dac,
        addr = AD3552R_REG_ADDR_CH_GAIN(ch);
        err = ad3552r_write_reg(dac, addr,
                                offset & AD3552R_MASK_CH_OFFSET_BITS_0_7);
-       if (err) {
-               dev_err(dev, "Error writing register\n");
-               goto put_child;
-       }
+       if (err)
+               return dev_err_probe(dev, err, "Error writing register\n");
 
        err = ad3552r_write_reg(dac, addr, reg);
-       if (err) {
-               dev_err(dev, "Error writing register\n");
-               goto put_child;
-       }
-
-put_child:
-       fwnode_handle_put(gain_child);
+       if (err)
+               return dev_err_probe(dev, err, "Error writing register\n");
 
-       return err;
+       return 0;
 }
 
 static void ad3552r_reg_disable(void *reg)