Input: twl6040-vibra - use cleanup facility for device_node
authorJavier Carrasco <javier.carrasco.cruz@gmail.com>
Sun, 20 Oct 2024 04:07:19 +0000 (21:07 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 20 Oct 2024 04:21:39 +0000 (21:21 -0700)
Use the '__free(device_node)' macro to simplify the code and error
handling. This makes the error handling more robust by ensuring that the
device node is always freed.

Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
Link: https://lore.kernel.org/r/20241010-input_automate_of_node_put-v1-4-ebc62138fbf8@gmail.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/misc/twl6040-vibra.c

index 78f0b63..afed9af 100644 (file)
@@ -229,14 +229,13 @@ static DEFINE_SIMPLE_DEV_PM_OPS(twl6040_vibra_pm_ops,
 static int twl6040_vibra_probe(struct platform_device *pdev)
 {
        struct device *twl6040_core_dev = pdev->dev.parent;
-       struct device_node *twl6040_core_node;
        struct vibra_info *info;
        int vddvibl_uV = 0;
        int vddvibr_uV = 0;
        int error;
 
-       twl6040_core_node = of_get_child_by_name(twl6040_core_dev->of_node,
-                                                "vibra");
+       struct device_node *twl6040_core_node __free(device_node) =
+               of_get_child_by_name(twl6040_core_dev->of_node, "vibra");
        if (!twl6040_core_node) {
                dev_err(&pdev->dev, "parent of node is missing?\n");
                return -EINVAL;
@@ -244,7 +243,6 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 
        info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
        if (!info) {
-               of_node_put(twl6040_core_node);
                dev_err(&pdev->dev, "couldn't allocate memory\n");
                return -ENOMEM;
        }
@@ -264,8 +262,6 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
        of_property_read_u32(twl6040_core_node, "ti,vddvibl-uV", &vddvibl_uV);
        of_property_read_u32(twl6040_core_node, "ti,vddvibr-uV", &vddvibr_uV);
 
-       of_node_put(twl6040_core_node);
-
        if ((!info->vibldrv_res && !info->viblmotor_res) ||
            (!info->vibrdrv_res && !info->vibrmotor_res)) {
                dev_err(info->dev, "invalid vibra driver/motor resistance\n");