提交 362b29ba 编写于 作者: T Timo Kokkonen 提交者: Mauro Carvalho Chehab

[media] ir-rx51: Trivial fixes

-Fix typo
-Change pwm_timer_num type to match type in platform data
-Remove extra parenthesis
-Replace magic constant with proper bit defintions
-Remove duplicate exit pointer
Signed-off-by: NTimo Kokkonen <timo.t.kokkonen@iki.fi>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 3404cb5c
...@@ -296,7 +296,7 @@ config IR_RX51 ...@@ -296,7 +296,7 @@ config IR_RX51
Say Y or M here if you want to enable support for the IR Say Y or M here if you want to enable support for the IR
transmitter diode built in the Nokia N900 (RX51) device. transmitter diode built in the Nokia N900 (RX51) device.
The driver uses omap DM timers for gereating the carrier The driver uses omap DM timers for generating the carrier
wave and pulses. wave and pulses.
config RC_LOOPBACK config RC_LOOPBACK
......
...@@ -59,7 +59,7 @@ struct lirc_rx51 { ...@@ -59,7 +59,7 @@ struct lirc_rx51 {
int wbuf[WBUF_LEN]; int wbuf[WBUF_LEN];
int wbuf_index; int wbuf_index;
unsigned long device_is_open; unsigned long device_is_open;
unsigned int pwm_timer_num; int pwm_timer_num;
}; };
static void lirc_rx51_on(struct lirc_rx51 *lirc_rx51) static void lirc_rx51_on(struct lirc_rx51 *lirc_rx51)
...@@ -125,11 +125,14 @@ static irqreturn_t lirc_rx51_interrupt_handler(int irq, void *ptr) ...@@ -125,11 +125,14 @@ static irqreturn_t lirc_rx51_interrupt_handler(int irq, void *ptr)
if (!retval) if (!retval)
return IRQ_NONE; return IRQ_NONE;
if ((retval & ~OMAP_TIMER_INT_MATCH)) if (retval & ~OMAP_TIMER_INT_MATCH)
dev_err_ratelimited(lirc_rx51->dev, dev_err_ratelimited(lirc_rx51->dev,
": Unexpected interrupt source: %x\n", retval); ": Unexpected interrupt source: %x\n", retval);
omap_dm_timer_write_status(lirc_rx51->pulse_timer, 7); omap_dm_timer_write_status(lirc_rx51->pulse_timer,
OMAP_TIMER_INT_MATCH |
OMAP_TIMER_INT_OVERFLOW |
OMAP_TIMER_INT_CAPTURE);
if (lirc_rx51->wbuf_index < 0) { if (lirc_rx51->wbuf_index < 0) {
dev_err_ratelimited(lirc_rx51->dev, dev_err_ratelimited(lirc_rx51->dev,
": BUG wbuf_index has value of %i\n", ": BUG wbuf_index has value of %i\n",
...@@ -472,7 +475,6 @@ struct platform_driver lirc_rx51_platform_driver = { ...@@ -472,7 +475,6 @@ struct platform_driver lirc_rx51_platform_driver = {
.remove = __exit_p(lirc_rx51_remove), .remove = __exit_p(lirc_rx51_remove),
.suspend = lirc_rx51_suspend, .suspend = lirc_rx51_suspend,
.resume = lirc_rx51_resume, .resume = lirc_rx51_resume,
.remove = __exit_p(lirc_rx51_remove),
.driver = { .driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册