Commit e752eef0 authored by Cai Huoqing's avatar Cai Huoqing Committed by Thierry Reding
Browse files

drm/tegra: plane: Improve use of dev_err_probe() 



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: default avatarCai Huoqing <caihuoqing@baidu.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent fc75e4fc

drivers/gpu/drm/tegra/plane.c

+6 −10
Original line number Diff line number Diff line
@@ -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",

	if (err)

		return dev_err_probe(dev, err, "failed to get %s interconnect\n",

				     icc_name);

		return err;

	}



	/* 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",

		if (err)

			return dev_err_probe(dev, err, "failed to get %s interconnect\n",

					     "winb-vfilter");

			return err;

		}

	}



	return 0;