From c563f4b4e4837470cd8dc98ac8f5247a5b89fb8b Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Tue, 12 Sep 2023 22:59:09 +0100 Subject: [PATCH] drm/tegra: Drop devm_gpiod_get_from_of_node The function devm_fwnode_gpiod_get() has been supported since Linux v5.5 and so it is not necessary to support devm_gpiod_get_from_of_node for pre-v6.3 kernels. Drop devm_gpiod_get_from_of_node() support to simplify the Tegra DRM driver. Bug 4119327 Change-Id: I5d1fb433d99f350e127e439f351412f8ec3ebc8f Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2979270 Reviewed-by: Mikko Perttunen GVS: Gerrit_Virtual_Submit --- drivers/gpu/drm/tegra/output.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c index fa079b49..54f442a6 100644 --- a/drivers/gpu/drm/tegra/output.c +++ b/drivers/gpu/drm/tegra/output.c @@ -134,19 +134,11 @@ int tegra_output_probe(struct tegra_output *output) } } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) output->hpd_gpio = devm_fwnode_gpiod_get(output->dev, of_fwnode_handle(output->of_node), "nvidia,hpd", GPIOD_IN, "HDMI hotplug detect"); -#else - output->hpd_gpio = devm_gpiod_get_from_of_node(output->dev, - output->of_node, - "nvidia,hpd-gpio", 0, - GPIOD_IN, - "HDMI hotplug detect"); -#endif if (IS_ERR(output->hpd_gpio)) { if (PTR_ERR(output->hpd_gpio) != -ENOENT) return PTR_ERR(output->hpd_gpio);