staging: media: av7110: remove dead code from av7110_hw.c
Subsystems (2)
PATCH 1/1 staging: media: av7110: remove dead code from av7110_hw.c
Remove functions av7110_reset_arm() and av7110_send_ci_cmd() which have both been disabled behind #if 0 since the introduction to staging. Code can be recovered from git history.
Signed-off-by Josh Hesketh <[email protected]>
--- drivers/staging/media/av7110/av7110_hw.c | 46 ------------------------ 1 file changed, 46 deletions(-)
drivers/staging/media/av7110/av7110_hw.c +0 -46
@@ -95,29 +95,6 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, unsigned int coreturn result; } -/* av7110 ARM core boot stuff */ -#if 0 -void av7110_reset_arm (struct av7110 *av7110) -{ -saa7146_setgpio (av7110->dev,RESET_LINE ,SAA7146_GPIO_OUTLO ); - -/* Disable DEBI and GPIO irq */ -SAA7146_IER_DISABLE (av7110->dev,MASK_19 |MASK_03 ); -SAA7146_ISR_CLEAR (av7110->dev,MASK_19 |MASK_03 ); - -saa7146_setgpio (av7110->dev,RESET_LINE ,SAA7146_GPIO_OUTHI ); -msleep (30 );/* the firmware needs some time to initialize */ - -ARM_ResetMailBox (av7110); - -SAA7146_ISR_CLEAR (av7110->dev,MASK_19 |MASK_03 ); -SAA7146_IER_ENABLE (av7110->dev,MASK_03 ); - - av7110->arm_ready =1 ; -dprintk (1 ,"reset ARM\n" ); -} -#endif /* 0 */ -static int waitdebi (struct av7110 *av7110,int adr,int state) {int k;
@@ -498,29 +475,6 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...)return ret; } -#if 0 -int av7110_send_ci_cmd (struct av7110 *av7110,u8 subcom,u8 *buf,u8 len) -{ -int i, ret; -u16 cmd[18 ] = { ((COMTYPE_COMMON_IF <<8 ) + subcom), -16 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 }; - -dprintk (4 ,"%p\n" , av7110); - -for (i =0 ; i < len && i <32 ; i++) { -if (i %2 ==0 ) - cmd[(i /2 ) +2 ] = (u16)(buf[i]) <<8 ; -else - cmd[(i /2 ) +2 ] |= buf[i]; - } - - ret =av7110_send_fw_cmd (av7110, cmd,18 ); -if (ret && ret != -ERESTARTSYS ) -pr_err ("%s(): error %d\n" , __func__, ret); -return ret; -} -#endif /* 0 */ -int av7110_fw_request (struct av7110 *av7110,u16 *request_buf,int request_buf_len,u16 *reply_buf,int reply_buf_len) {
Signature · 1 line
2.53.0
Quoted 4 lines · Josh Hesketh
Remove functions
av7110_reset_arm()andav7110_send_ci_cmd()which have both been disabled behind #if 0 since the introduction to staging. Code can be recovered from git history.
cleanup patches for this driver won't be accepted anymore :(
--
regards,
jose a. p-a