]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/tegra: sor: Make use of the helper function dev_err_probe()
authorCai Huoqing <caihuoqing@baidu.com>
Fri, 17 Sep 2021 02:07:41 +0000 (10:07 +0800)
committerThierry Reding <treding@nvidia.com>
Tue, 4 Apr 2023 16:04:57 +0000 (18:04 +0200)
When possible use dev_err_probe help to properly deal with the
PROBE_DEFER error, the benefit is that DEFER issue will be logged
in the devices_deferred debugfs file.
And using dev_err_probe() can reduce code size, the error value
gets printed.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
drivers/gpu/drm/tegra/sor.c

index 8eafbdd3620c32fb5c92a056a7724cf51e484295..cd25f409979c35ca6723b768c0379ea6e14489dd 100644 (file)
@@ -2964,11 +2964,9 @@ static int tegra_sor_hdmi_probe(struct tegra_sor *sor)
        int err;
 
        sor->avdd_io_supply = devm_regulator_get(sor->dev, "avdd-io-hdmi-dp");
-       if (IS_ERR(sor->avdd_io_supply)) {
-               dev_err(sor->dev, "cannot get AVDD I/O supply: %ld\n",
-                       PTR_ERR(sor->avdd_io_supply));
-               return PTR_ERR(sor->avdd_io_supply);
-       }
+       if (IS_ERR(sor->avdd_io_supply))
+               return dev_err_probe(sor->dev, PTR_ERR(sor->avdd_io_supply),
+                                    "cannot get AVDD I/O supply\n");
 
        err = tegra_sor_enable_regulator(sor, sor->avdd_io_supply);
        if (err < 0) {
@@ -2978,11 +2976,9 @@ static int tegra_sor_hdmi_probe(struct tegra_sor *sor)
        }
 
        sor->vdd_pll_supply = devm_regulator_get(sor->dev, "vdd-hdmi-dp-pll");
-       if (IS_ERR(sor->vdd_pll_supply)) {
-               dev_err(sor->dev, "cannot get VDD PLL supply: %ld\n",
-                       PTR_ERR(sor->vdd_pll_supply));
-               return PTR_ERR(sor->vdd_pll_supply);
-       }
+       if (IS_ERR(sor->vdd_pll_supply))
+               return dev_err_probe(sor->dev, PTR_ERR(sor->vdd_pll_supply),
+                                    "cannot get VDD PLL supply\n");
 
        err = tegra_sor_enable_regulator(sor, sor->vdd_pll_supply);
        if (err < 0) {
@@ -2992,11 +2988,9 @@ static int tegra_sor_hdmi_probe(struct tegra_sor *sor)
        }
 
        sor->hdmi_supply = devm_regulator_get(sor->dev, "hdmi");
-       if (IS_ERR(sor->hdmi_supply)) {
-               dev_err(sor->dev, "cannot get HDMI supply: %ld\n",
-                       PTR_ERR(sor->hdmi_supply));
-               return PTR_ERR(sor->hdmi_supply);
-       }
+       if (IS_ERR(sor->hdmi_supply))
+               return dev_err_probe(sor->dev, PTR_ERR(sor->hdmi_supply),
+                                    "cannot get HDMI supply\n");
 
        err = tegra_sor_enable_regulator(sor, sor->hdmi_supply);
        if (err < 0) {