Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] constify of_device_id array

Browse source 
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>
This commit is contained in:
Fabian Frederick 2015-03-16 16:54:33 -03:00 committed by Mauro Carvalho Chehab
parent 52722ca8c5
commit 7f099a7558
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/i2c/adv7604.c
View file

@ -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] }, { "adv7604", (kernel_ulong_t)&adv76xx_chip_info[ADV7604] },
{ "adv7611", (kernel_ulong_t)&adv76xx_chip_info[ADV7611] }, { "adv7611", (kernel_ulong_t)&adv76xx_chip_info[ADV7611] },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, adv76xx_i2c_id); 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] }, { .compatible = "adi,adv7611", .data = &adv76xx_chip_info[ADV7611] },
{ } { }
}; };

2
drivers/media/platform/fsl-viu.c
View file

@ -1664,7 +1664,7 @@ static int viu_resume(struct platform_device *op)
/* /*
* Initialization and module stuff * Initialization and module stuff
*/ */
static struct of_device_id mpc512x_viu_of_match[] = { static const struct of_device_id mpc512x_viu_of_match[] = {
{ {
.compatible = "fsl,mpc5121-viu", .compatible = "fsl,mpc5121-viu",
}, },

2
drivers/media/platform/soc_camera/rcar_vin.c
View file

@ -1821,7 +1821,7 @@ static struct soc_camera_host_ops rcar_vin_host_ops = {
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF
static struct of_device_id rcar_vin_of_table[] = { static const struct of_device_id rcar_vin_of_table[] = {
{ .compatible = "renesas,vin-r8a7794", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,vin-r8a7794", .data = (void *)RCAR_GEN2 },
{ .compatible = "renesas,vin-r8a7793", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,vin-r8a7793", .data = (void *)RCAR_GEN2 },
{ .compatible = "renesas,vin-r8a7791", .data = (void *)RCAR_GEN2 }, { .compatible = "renesas,vin-r8a7791", .data = (void *)RCAR_GEN2 },

2
drivers/media/rc/gpio-ir-recv.c
View file

@ -59,7 +59,7 @@ static int gpio_ir_recv_get_devtree_pdata(struct device *dev,
return 0; return 0;
} }
static struct of_device_id gpio_ir_recv_of_match[] = { static const struct of_device_id gpio_ir_recv_of_match[] = {
{ .compatible = "gpio-ir-receiver", }, { .compatible = "gpio-ir-receiver", },
{ }, { },
}; };

2
drivers/media/rc/ir-hix5hd2.c
View file

@ -319,7 +319,7 @@ static int hix5hd2_ir_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(hix5hd2_ir_pm_ops, hix5hd2_ir_suspend, static SIMPLE_DEV_PM_OPS(hix5hd2_ir_pm_ops, hix5hd2_ir_suspend,
hix5hd2_ir_resume); hix5hd2_ir_resume);
static struct of_device_id hix5hd2_ir_table[] = { static const struct of_device_id hix5hd2_ir_table[] = {
{ .compatible = "hisilicon,hix5hd2-ir", }, { .compatible = "hisilicon,hix5hd2-ir", },
{}, {},
}; };

2
drivers/media/rc/st_rc.c
View file

@ -381,7 +381,7 @@ static int st_rc_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(st_rc_pm_ops, st_rc_suspend, st_rc_resume); static SIMPLE_DEV_PM_OPS(st_rc_pm_ops, st_rc_suspend, st_rc_resume);
#ifdef CONFIG_OF #ifdef CONFIG_OF
static struct of_device_id st_rc_match[] = { static const struct of_device_id st_rc_match[] = {
{ .compatible = "st,comms-irb", }, { .compatible = "st,comms-irb", },
{}, {},
}; };