]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
[media] staging: lirc_sir: remove dead code
authorAlexander Shiyan <shc_work@mail.ru>
Mon, 25 Mar 2013 08:27:12 +0000 (05:27 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 25 Mar 2013 11:21:20 +0000 (08:21 -0300)
lirc_sir uses the CONFIG_SA1100_BITSY Kconfig macro. But its Kconfig
symbol was removed in v2.4.13. So remove dead code associated with it.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/staging/media/lirc/lirc_sir.c

index 63a554c36f751034d053a45a60262163c5500b23..f781c532b3c42e7c4a8b3635c66b967cc8beb649 100644 (file)
@@ -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