summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/dm644x.c
diff options
context:
space:
mode:
authorManjunath Hadli <manjunath.hadli@ti.com>2011-12-21 19:13:38 +0530
committerSekhar Nori <nsekhar@ti.com>2012-02-25 02:40:22 +0530
commit314d7389608831202f5b445d9154e30161935630 (patch)
treefd4495203b830fe560ea5c03fd73c56941028217 /arch/arm/mach-davinci/dm644x.c
parent51f31cb3a22da0fdae69052a98d976fb4ff5857d (diff)
ARM: davinci: dm644x: fix inconsistent variable naming
Add dm644x_ prefix to names of v4l2 variables in dm644x.c Add dm644xevm_ prefix to names of v4l2 variables in board-dm644x-evm.c. This makes the code consistent with rest of these files. Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/dm644x.c')
-rw-r--r--arch/arm/mach-davinci/dm644x.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index b5377a2ee23..fc48faec57e 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -614,7 +614,7 @@ static struct platform_device dm644x_vpss_device = {
.resource = dm644x_vpss_resources,
};
-static struct resource vpfe_resources[] = {
+static struct resource dm644x_vpfe_resources[] = {
{
.start = IRQ_VDINT0,
.end = IRQ_VDINT0,
@@ -648,11 +648,11 @@ static struct platform_device dm644x_ccdc_dev = {
},
};
-static struct platform_device vpfe_capture_dev = {
+static struct platform_device dm644x_vpfe_dev = {
.name = CAPTURE_DRV_NAME,
.id = -1,
- .num_resources = ARRAY_SIZE(vpfe_resources),
- .resource = vpfe_resources,
+ .num_resources = ARRAY_SIZE(dm644x_vpfe_resources),
+ .resource = dm644x_vpfe_resources,
.dev = {
.dma_mask = &vpfe_capture_dma_mask,
.coherent_dma_mask = DMA_BIT_MASK(32),
@@ -661,7 +661,7 @@ static struct platform_device vpfe_capture_dev = {
void dm644x_set_vpfe_config(struct vpfe_config *cfg)
{
- vpfe_capture_dev.dev.platform_data = cfg;
+ dm644x_vpfe_dev.dev.platform_data = cfg;
}
/*----------------------------------------------------------------------*/
@@ -808,7 +808,7 @@ static int __init dm644x_init_devices(void)
platform_device_register(&dm644x_vpss_device);
platform_device_register(&dm644x_ccdc_dev);
- platform_device_register(&vpfe_capture_dev);
+ platform_device_register(&dm644x_vpfe_dev);
return 0;
}