From: Alexander Shiyan Date: Mon, 25 Mar 2013 08:27:12 +0000 (-0300) Subject: [media] staging: lirc_sir: remove dead code X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c535cc6c714bd21b3afad35baa926b3b9eb51361;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git [media] staging: lirc_sir: remove dead code 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 Signed-off-by: Alexander Shiyan Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c index 63a554c36f75..f781c532b3c4 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