firmware: tegra: bpmp: Use scoped device node handling to simplify error paths

Obtain the device node reference with scoped/cleanup.h to reduce error
handling and make the code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/drivers/firmware/tegra/bpmp.c b/drivers/firmware/tegra/bpmp.c
index c3a1dc3449617f8eaa1f20000bdc6d478deb77c4..2bee6e918f8117e77cbd8172057e4523e4fa21d0 100644 (file)
--- a/drivers/firmware/tegra/bpmp.c
+++ b/drivers/firmware/tegra/bpmp.c
@@ -3,6 +3,7 @@
  * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
  */
 
+#include <linux/cleanup.h>
 #include <linux/clk/tegra.h>
 #include <linux/genalloc.h>
 #include <linux/mailbox_client.h>
@@ -34,29 +35,24 @@ channel_to_ops(struct tegra_bpmp_channel *channel)
 
 struct tegra_bpmp *tegra_bpmp_get(struct device *dev)
 {
+       struct device_node *np __free(device_node);
        struct platform_device *pdev;
        struct tegra_bpmp *bpmp;
-       struct device_node *np;
 
        np = of_parse_phandle(dev->of_node, "nvidia,bpmp", 0);
        if (!np)
                return ERR_PTR(-ENOENT);
 
        pdev = of_find_device_by_node(np);
-       if (!pdev) {
-               bpmp = ERR_PTR(-ENODEV);
-               goto put;
-       }
+       if (!pdev)
+               return ERR_PTR(-ENODEV);
 
        bpmp = platform_get_drvdata(pdev);
        if (!bpmp) {
-               bpmp = ERR_PTR(-EPROBE_DEFER);
                put_device(&pdev->dev);
-               goto put;
+               return ERR_PTR(-EPROBE_DEFER);
        }
 
-put:
-       of_node_put(np);
        return bpmp;
 }
 EXPORT_SYMBOL_GPL(tegra_bpmp_get);