[media] constify of_device_id array

of_device_id is always used as const.
(See driver.of_match_table and open firmware functions)

[mchehab@osg.samsung.com: fix a merge conflict at adv7604.c]
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index c1be0f7..be3f866 100644 (file)
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -2642,14 +2642,14 @@ static const struct adv76xx_chip_info adv76xx_chip_info[] = {
        },
 };
 
-static struct i2c_device_id adv76xx_i2c_id[] = {
+static const struct i2c_device_id adv76xx_i2c_id[] = {
        { "adv7604", (kernel_ulong_t)&adv76xx_chip_info[ADV7604] },
        { "adv7611", (kernel_ulong_t)&adv76xx_chip_info[ADV7611] },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, adv76xx_i2c_id);
 
-static struct of_device_id adv76xx_of_id[] __maybe_unused = {
+static const struct of_device_id adv76xx_of_id[] __maybe_unused = {
        { .compatible = "adi,adv7611", .data = &adv76xx_chip_info[ADV7611] },
        { }
 };

diff --cc drivers/media/platform/fsl-viu.c
Simple merge

diff --cc drivers/media/platform/soc_camera/rcar_vin.c
Simple merge

diff --cc drivers/media/rc/gpio-ir-recv.c
Simple merge

diff --cc drivers/media/rc/ir-hix5hd2.c
Simple merge

diff --cc drivers/media/rc/st_rc.c
Simple merge