Skip to contentSkip to conversation

dm644x_ccdc: remove check for CONFIG_DM644X_VIDEO_PORT_ENABLE

PATCH Applied Paul Bolle 2 participants 2 messages May 22, 2014 – Jun 9, 2014 Media (V4L/DVB)

lore
Share & tools
lore

Paul Bolle

author
#0 lore raw

PATCH 1/1 dm644x_ccdc: remove check for CONFIG_DM644X_VIDEO_PORT_ENABLE

A check for CONFIG_DM644X_VIDEO_PORT_ENABLE was added in v2.6.32. The related Kconfig symbol was never added so this check has always evaluated to false. Remove that check.

Signed-off-by Paul Bolle <[email protected]>

---
Untested.

Related, trivial, cleanup: make ccdc_enable_vport() a oneliner.

 drivers/media/platform/davinci/dm644x_ccdc.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/media/platform/davinci/dm644x_ccdc.c +0 -5
index 30fa08405d61..07e98df3d867 100644
@@ -581,13 +581,8 @@ void ccdc_config_raw(void)
 	     config_params->alaw.enable)
 		syn_mode |= CCDC_DATA_PACK_ENABLE;
 
-#ifdef CONFIG_DM644X_VIDEO_PORT_ENABLE
-	/* enable video port */
-	val = CCDC_ENABLE_VIDEO_PORT;
-#else
 	/* disable video port */
 	val = CCDC_DISABLE_VIDEO_PORT;
-#endif
 
 	if (config_params->data_sz == CCDC_DATA_8BITS)
 		val |= (CCDC_DATA_10BITS & CCDC_FMTCFG_VPIN_MASK)
Signature · 1 line
1.9.0
Applied
#1 lore raw

Hi Paul,

Thanks for the patch.

Quoted 4 lines · Paul Bolle

A check for CONFIG_DM644X_VIDEO_PORT_ENABLE was added in v2.6.32. The related Kconfig symbol was never added so this check has always evaluated to false. Remove that check.

Applied.

Thanks,
--Prabhakar Lad

Quoted 30 lines
Signed-off-by Paul Bolle <[email protected]>

---
Untested.

Related, trivial, cleanup: make ccdc_enable_vport() a oneliner.

 drivers/media/platform/davinci/dm644x_ccdc.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/media/platform/davinci/dm644x_ccdc.c +0 -6
index 30fa08405d61..07e98df3d867 100644
@@ -581,13 +581,8 @@ void ccdc_config_raw(void)
             config_params->alaw.enable)
                syn_mode |= CCDC_DATA_PACK_ENABLE;
 
-#ifdef CONFIG_DM644X_VIDEO_PORT_ENABLE
-       /* enable video port */
-       val = CCDC_ENABLE_VIDEO_PORT;
-#else
        /* disable video port */
        val = CCDC_DISABLE_VIDEO_PORT;
-#endif
 
        if (config_params->data_sz == CCDC_DATA_8BITS)
                val |= (CCDC_DATA_10BITS & CCDC_FMTCFG_VPIN_MASK)
--

1.9.0