Takashi Iwai bd3e29
From 36fba366cf9fa386e5905976e68380061feabd2e Mon Sep 17 00:00:00 2001
Takashi Iwai bd3e29
From: Arnd Bergmann <arnd@arndb.de>
Takashi Iwai bd3e29
Date: Mon, 26 Oct 2020 20:41:02 +0100
Takashi Iwai bd3e29
Subject: [PATCH] drm/imx: tve remove extraneous type qualifier
Takashi Iwai bd3e29
Git-commit: 36fba366cf9fa386e5905976e68380061feabd2e
Takashi Iwai bd3e29
Patch-mainline: v5.10-rc3
Takashi Iwai bd3e29
References: git-fixes
Takashi Iwai bd3e29
Takashi Iwai bd3e29
clang warns about functions returning a 'const int' result:
Takashi Iwai bd3e29
Takashi Iwai bd3e29
drivers/gpu/drm/imx/imx-tve.c:487:8: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
Takashi Iwai bd3e29
Takashi Iwai bd3e29
Remove the extraneous 'const' qualifier here. I would guess that the
Takashi Iwai bd3e29
function was intended to be marked __attribute__((const)) instead,
Takashi Iwai bd3e29
but that would also be wrong since it call other functions without
Takashi Iwai bd3e29
that attribute.
Takashi Iwai bd3e29
Takashi Iwai bd3e29
Fixes: fcbc51e54d2a ("staging: drm/imx: Add support for Television Encoder (TVEv2)")
Takashi Iwai bd3e29
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Takashi Iwai bd3e29
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Takashi Iwai bd3e29
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Takashi Iwai bd3e29
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai bd3e29
Takashi Iwai bd3e29
---
Takashi Iwai bd3e29
 drivers/gpu/drm/imx/imx-tve.c | 2 +-
Takashi Iwai bd3e29
 1 file changed, 1 insertion(+), 1 deletion(-)
Takashi Iwai bd3e29
Takashi Iwai bd3e29
diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
Takashi Iwai bd3e29
index ef3c25d87d87..2a8d2e32e7b4 100644
Takashi Iwai bd3e29
--- a/drivers/gpu/drm/imx/imx-tve.c
Takashi Iwai bd3e29
+++ b/drivers/gpu/drm/imx/imx-tve.c
Takashi Iwai bd3e29
@@ -484,7 +484,7 @@ static const char * const imx_tve_modes[] = {
Takashi Iwai bd3e29
 	[TVE_MODE_VGA] = "vga",
Takashi Iwai bd3e29
 };
Takashi Iwai bd3e29
 
Takashi Iwai bd3e29
-static const int of_get_tve_mode(struct device_node *np)
Takashi Iwai bd3e29
+static int of_get_tve_mode(struct device_node *np)
Takashi Iwai bd3e29
 {
Takashi Iwai bd3e29
 	const char *bm;
Takashi Iwai bd3e29
 	int ret, i;
Takashi Iwai bd3e29
-- 
Takashi Iwai bd3e29
2.16.4
Takashi Iwai bd3e29