| Message ID | 1364203632.1390.254.camel@x61.thuisdomein (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Just found that the exactly the same patch has been posted a while ago: http://driverdev.linuxdriverproject.org/pipermail/devel/2012-November/033623.html On 3/25/13, Paul Bolle <pebolle@tiscali.nl> wrote: > 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@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 > > _______________________________________________ > devel mailing list > devel@linuxdriverproject.org > http://driverdev.linuxdriverproject.org/mailman/listinfo/devel >
On Mon, 2013-03-25 at 13:40 +0400, Denis Kirjanov wrote: > Just found that the exactly the same patch has been posted a while ago: > http://driverdev.linuxdriverproject.org/pipermail/devel/2012-November/033623.html Thanks for that. Is that previous patch queued somewhere? Paul Bolle -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Greg, looks like you have missed it in the queue for 3.8-rc1 On 3/25/13, Paul Bolle <pebolle@tiscali.nl> wrote: > On Mon, 2013-03-25 at 13:40 +0400, Denis Kirjanov wrote: >> Just found that the exactly the same patch has been posted a while ago: >> http://driverdev.linuxdriverproject.org/pipermail/devel/2012-November/033623.html > > Thanks for that. Is that previous patch queued somewhere? > > > Paul Bolle > >
Em Mon, 25 Mar 2013 13:59:44 +0400 Denis Kirjanov <kirjanov@gmail.com> escreveu: > Greg, looks like you have missed it in the queue for 3.8-rc1 Greg won't likely apply it, as drivers/stating/media is maintained by me. I'll pick it and apply, adding Paul SOB on it. > > > > On 3/25/13, Paul Bolle <pebolle@tiscali.nl> wrote: > > On Mon, 2013-03-25 at 13:40 +0400, Denis Kirjanov wrote: > >> Just found that the exactly the same patch has been posted a while ago: > >> http://driverdev.linuxdriverproject.org/pipermail/devel/2012-November/033623.html > > > > Thanks for that. Is that previous patch queued somewhere? > > > > > > Paul Bolle > > > > > >
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
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@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(-)