leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: me4000: use dev->irq to save the irq number

Browse Source 
Use the irq variable provided in the comedi_device to save the
irq number and remove it from the private data.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-09-07 17:45:26 -07:00 committed by Greg Kroah-Hartman
parent e1d7ccb770
commit 109daa7980
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/comedi/drivers/me4000.c
View File

@ -332,7 +332,7 @@ static int init_board_info(struct comedi_device *dev, struct pci_dev *pci_dev_p)
/* spin_lock_init(&info->ai_ctrl_lock); */ /* spin_lock_init(&info->ai_ctrl_lock); */
/* Get the irq assigned to the board */ /* Get the irq assigned to the board */
info->irq = pci_dev_p->irq; dev->irq = pci_dev_p->irq;
return 0; return 0;
} }
@ -1266,7 +1266,7 @@ static irqreturn_t me4000_ai_isr(int irq, void *dev_id)
s->async->events = 0; s->async->events = 0;
/* Check if irq number is right */ /* Check if irq number is right */
if (irq != info->irq) { if (irq != dev->irq) {
printk(KERN_ERR printk(KERN_ERR
"comedi%d: me4000: me4000_ai_isr(): " "comedi%d: me4000: me4000_ai_isr(): "
"Incorrect interrupt num: %d\n", dev->minor, irq); "Incorrect interrupt num: %d\n", dev->minor, irq);
@ -1876,8 +1876,8 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->range_table = &me4000_ai_range; s->range_table = &me4000_ai_range;
s->insn_read = me4000_ai_insn_read; s->insn_read = me4000_ai_insn_read;
if (info->irq > 0) { if (dev->irq > 0) {
if (request_irq(info->irq, me4000_ai_isr, if (request_irq(dev->irq, me4000_ai_isr,
IRQF_SHARED, "ME-4000", dev)) { IRQF_SHARED, "ME-4000", dev)) {
printk printk
("comedi%d: me4000: me4000_attach(): " ("comedi%d: me4000: me4000_attach(): "

2
drivers/staging/comedi/drivers/me4000.h
View File

@ -224,8 +224,6 @@ struct me4000_info {
struct pci_dev *pci_dev_p; /* General PCI information */ struct pci_dev *pci_dev_p; /* General PCI information */
unsigned int irq; /* IRQ assigned from the PCI BIOS */
unsigned int ao_readback[4]; unsigned int ao_readback[4];
}; };