Commit c4b0afee authored by Jarod Wilson's avatar Jarod Wilson Committed by Mauro Carvalho Chehab

[media] [staging] lirc_serial: allocate irq at init time

There's really no good reason not to just grab the desired IRQ at driver
init time, instead of every time the lirc device node is accessed. This
also improves the speed and reliability with which a serial transmitter
can operate, as back-to-back transmission attempts (i.e., channel change
to a multi-digit channel) don't have to spend time acquiring and then
releasing the IRQ for every digit, sometimes multiple times, if lircd
has been told to use the min_repeat parameter.

CC: devel@driverdev.osuosl.org
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6a8c97ac
...@@ -838,7 +838,23 @@ static int hardware_init_port(void) ...@@ -838,7 +838,23 @@ static int hardware_init_port(void)
static int init_port(void) static int init_port(void)
{ {
int i, nlow, nhigh; int i, nlow, nhigh, result;
result = request_irq(irq, irq_handler,
IRQF_DISABLED | (share_irq ? IRQF_SHARED : 0),
LIRC_DRIVER_NAME, (void *)&hardware);
switch (result) {
case -EBUSY:
printk(KERN_ERR LIRC_DRIVER_NAME ": IRQ %d busy\n", irq);
return -EBUSY;
case -EINVAL:
printk(KERN_ERR LIRC_DRIVER_NAME
": Bad irq number or handler\n");
return -EINVAL;
default:
break;
};
/* Reserve io region. */ /* Reserve io region. */
/* /*
...@@ -893,34 +909,17 @@ static int init_port(void) ...@@ -893,34 +909,17 @@ static int init_port(void)
printk(KERN_INFO LIRC_DRIVER_NAME ": Manually using active " printk(KERN_INFO LIRC_DRIVER_NAME ": Manually using active "
"%s receiver\n", sense ? "low" : "high"); "%s receiver\n", sense ? "low" : "high");
dprintk("Interrupt %d, port %04x obtained\n", irq, io);
return 0; return 0;
} }
static int set_use_inc(void *data) static int set_use_inc(void *data)
{ {
int result;
unsigned long flags; unsigned long flags;
/* initialize timestamp */ /* initialize timestamp */
do_gettimeofday(&lasttv); do_gettimeofday(&lasttv);
result = request_irq(irq, irq_handler,
IRQF_DISABLED | (share_irq ? IRQF_SHARED : 0),
LIRC_DRIVER_NAME, (void *)&hardware);
switch (result) {
case -EBUSY:
printk(KERN_ERR LIRC_DRIVER_NAME ": IRQ %d busy\n", irq);
return -EBUSY;
case -EINVAL:
printk(KERN_ERR LIRC_DRIVER_NAME
": Bad irq number or handler\n");
return -EINVAL;
default:
dprintk("Interrupt %d, port %04x obtained\n", irq, io);
break;
}
spin_lock_irqsave(&hardware[type].lock, flags); spin_lock_irqsave(&hardware[type].lock, flags);
/* Set DLAB 0. */ /* Set DLAB 0. */
...@@ -945,10 +944,6 @@ static void set_use_dec(void *data) ...@@ -945,10 +944,6 @@ static void set_use_dec(void *data)
soutp(UART_IER, sinp(UART_IER) & soutp(UART_IER, sinp(UART_IER) &
(~(UART_IER_MSI|UART_IER_RLSI|UART_IER_THRI|UART_IER_RDI))); (~(UART_IER_MSI|UART_IER_RLSI|UART_IER_THRI|UART_IER_RDI)));
spin_unlock_irqrestore(&hardware[type].lock, flags); spin_unlock_irqrestore(&hardware[type].lock, flags);
free_irq(irq, (void *)&hardware);
dprintk("freed IRQ %d\n", irq);
} }
static ssize_t lirc_write(struct file *file, const char *buf, static ssize_t lirc_write(struct file *file, const char *buf,
...@@ -1256,6 +1251,9 @@ static int __init lirc_serial_init_module(void) ...@@ -1256,6 +1251,9 @@ static int __init lirc_serial_init_module(void)
static void __exit lirc_serial_exit_module(void) static void __exit lirc_serial_exit_module(void)
{ {
lirc_serial_exit(); lirc_serial_exit();
free_irq(irq, (void *)&hardware);
if (iommap != 0) if (iommap != 0)
release_mem_region(iommap, 8 << ioshift); release_mem_region(iommap, 8 << ioshift);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment