[PATCH] staging: lirc: remove dead code

Paul Bolle pebolle at tiscali.nl
Mon Mar 25 09:27:12 UTC 2013


lirc uses the CONFIG_SA1100_BITSY Kconfig macro. But its Kconfig symbol
was removed in v2.4.13. So we can remove a few lines of dead code.

Signed-off-by: Paul Bolle <pebolle at tiscali.nl>
---
Untested, but of rather low risk. Note that support for the
machine_is_bitsy() macro was already removed in v2.4.10. 

 drivers/staging/media/lirc/lirc_sir.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c
index 63a554c..f781c53 100644
--- a/drivers/staging/media/lirc/lirc_sir.c
+++ b/drivers/staging/media/lirc/lirc_sir.c
@@ -787,12 +787,6 @@ static int init_hardware(void)
 	spin_lock_irqsave(&hardware_lock, flags);
 	/* reset UART */
 #ifdef LIRC_ON_SA1100
-#ifdef CONFIG_SA1100_BITSY
-	if (machine_is_bitsy()) {
-		pr_info("Power on IR module\n");
-		set_bitsy_egpio(EGPIO_BITSY_IR_ON);
-	}
-#endif
 #ifdef CONFIG_SA1100_COLLIE
 	sa1100_irda_set_power_collie(3);	/* power on */
 #endif
@@ -942,10 +936,6 @@ static void drop_hardware(void)
 	Ser2UTCR3 = sr.utcr3;
 
 	Ser2HSCR0 = sr.hscr0;
-#ifdef CONFIG_SA1100_BITSY
-	if (machine_is_bitsy())
-		clr_bitsy_egpio(EGPIO_BITSY_IR_ON);
-#endif
 #ifdef CONFIG_SA1100_COLLIE
 	sa1100_irda_set_power_collie(0);	/* power off */
 #endif
-- 
1.7.11.7




More information about the devel mailing list