The commit 98d7bbb9 changed *of_device_id.data to const which introduced warnings in various places that have mostly been fixed. This patch fixes one such warning by introducing two const qualifiers. GCC warning: drivers/media/video/coda.c:1785:16: warning: assignment discards ‘const’ qualifier from pointer target type [enabled by default] Signed-off-by: Emil Goode <emilgoode@xxxxxxxxx> --- drivers/media/video/coda.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/coda.c b/drivers/media/video/coda.c index 0d6e0a0..6908514 100644 --- a/drivers/media/video/coda.c +++ b/drivers/media/video/coda.c @@ -118,7 +118,7 @@ struct coda_dev { struct v4l2_device v4l2_dev; struct video_device vfd; struct platform_device *plat_dev; - struct coda_devtype *devtype; + const struct coda_devtype *devtype; void __iomem *regs_base; struct clk *clk_per; @@ -1687,7 +1687,7 @@ enum coda_platform { CODA_IMX27, }; -static struct coda_devtype coda_devdata[] = { +static const struct coda_devtype coda_devdata[] = { [CODA_IMX27] = { .firmware = "v4l-codadx6-imx27.bin", .product = CODA_DX6, -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html