Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9590e69d authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Rob Clark
Browse files

drm/msm: use devm_gpiod_get_optional for optional reset gpio 



Since 39b2bbe3 (gpio: add flags argument to gpiod_get*() functions)
which appeared in v3.17-rc1, the gpiod_get* functions take an additional
parameter that allows to specify direction and initial value for output.

Also there is a variant to find optional gpios that returns NULL if
there is no gpio instead of -ENOENT.

Make use of both features to simplify the driver.

This makes error checking more strict because errors like -ENOSYS ("no
gpio support compiled in") or -EPROBE_DEFER ("gpio not ready yet") are
handled correctly now.

Furthermore this is one caller less that stops us making the flags
argument to gpiod_get*() mandatory.

Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent ec31abf6

drivers/gpu/drm/msm/dsi/dsi_host.c

+6 −23
Original line number Original line Diff line number Diff line
@@ -1349,36 +1349,19 @@ static irqreturn_t dsi_host_irq(int irq, void *ptr) 
static int dsi_host_init_panel_gpios(struct msm_dsi_host *msm_host,

static int dsi_host_init_panel_gpios(struct msm_dsi_host *msm_host,

			struct device *panel_device)

			struct device *panel_device)

{

{

	int ret;

	msm_host->disp_en_gpio = devm_gpiod_get_optional(panel_device,



							 "disp-enable",

	msm_host->disp_en_gpio = devm_gpiod_get(panel_device,

							 GPIOD_OUT_LOW);

						"disp-enable");

	if (IS_ERR(msm_host->disp_en_gpio)) {

	if (IS_ERR(msm_host->disp_en_gpio)) {

		DBG("cannot get disp-enable-gpios %ld",

		DBG("cannot get disp-enable-gpios %ld",

				PTR_ERR(msm_host->disp_en_gpio));

				PTR_ERR(msm_host->disp_en_gpio));

		msm_host->disp_en_gpio = NULL;

		return PTR_ERR(msm_host->disp_en_gpio);

	}

	if (msm_host->disp_en_gpio) {

		ret = gpiod_direction_output(msm_host->disp_en_gpio, 0);

		if (ret) {

			pr_err("cannot set dir to disp-en-gpios %d\n", ret);

			return ret;

		}

	}

	}





	msm_host->te_gpio = devm_gpiod_get(panel_device, "disp-te");

	msm_host->te_gpio = devm_gpiod_get(panel_device, "disp-te", GPIOD_IN);

	if (IS_ERR(msm_host->te_gpio)) {

	if (IS_ERR(msm_host->te_gpio)) {

		DBG("cannot get disp-te-gpios %ld", PTR_ERR(msm_host->te_gpio));

		DBG("cannot get disp-te-gpios %ld", PTR_ERR(msm_host->te_gpio));

		msm_host->te_gpio = NULL;

		return PTR_ERR(msm_host->te_gpio);

	}



	if (msm_host->te_gpio) {

		ret = gpiod_direction_input(msm_host->te_gpio);

		if (ret) {

			pr_err("%s: cannot set dir to disp-te-gpios, %d\n",

				__func__, ret);

			return ret;

		}

	}

	}





	return 0;

	return 0;