]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/tegra: plane: Improve use of dev_err_probe()
authorCai Huoqing <caihuoqing@baidu.com>
Thu, 16 Sep 2021 07:37:21 +0000 (15:37 +0800)
committerThierry Reding <treding@nvidia.com>
Tue, 4 Apr 2023 16:04:57 +0000 (18:04 +0200)
Return dev_err_probe() directly, because the return value of
dev_err_probe() is the appropriate error code, and it can
reduce code size, simplify the code.

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/gpu/drm/tegra/plane.c

index 10090116895ff929f17388772ad4f434237ce1bd..ffe5f06b770dcd314ad0543dfe05df0e8c4cc82e 100644 (file)
@@ -777,21 +777,17 @@ int tegra_plane_interconnect_init(struct tegra_plane *plane)
 
        plane->icc_mem = devm_of_icc_get(dev, icc_name);
        err = PTR_ERR_OR_ZERO(plane->icc_mem);
-       if (err) {
-               dev_err_probe(dev, err, "failed to get %s interconnect\n",
-                             icc_name);
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err, "failed to get %s interconnect\n",
+                                    icc_name);
 
        /* plane B on T20/30 has a dedicated memory client for a 6-tap vertical filter */
        if (plane->index == 1 && dc->soc->has_win_b_vfilter_mem_client) {
                plane->icc_mem_vfilter = devm_of_icc_get(dev, "winb-vfilter");
                err = PTR_ERR_OR_ZERO(plane->icc_mem_vfilter);
-               if (err) {
-                       dev_err_probe(dev, err, "failed to get %s interconnect\n",
-                                     "winb-vfilter");
-                       return err;
-               }
+               if (err)
+                       return dev_err_probe(dev, err, "failed to get %s interconnect\n",
+                                            "winb-vfilter");
        }
 
        return 0;