projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (5237): Dvb: add new qt1010 tuner module
[powerpc.git]
/
drivers
/
parisc
/
superio.c
diff --git
a/drivers/parisc/superio.c
b/drivers/parisc/superio.c
index
719b863
..
1fd97f7
100644
(file)
--- a/
drivers/parisc/superio.c
+++ b/
drivers/parisc/superio.c
@@
-94,7
+94,7
@@
static struct superio_device sio_dev;
#define PFX SUPERIO ": "
static irqreturn_t
#define PFX SUPERIO ": "
static irqreturn_t
-superio_interrupt(int parent_irq, void *devp
, struct pt_regs *regs
)
+superio_interrupt(int parent_irq, void *devp)
{
u8 results;
u8 local_irq;
{
u8 results;
u8 local_irq;
@@
-138,7
+138,7
@@
superio_interrupt(int parent_irq, void *devp, struct pt_regs *regs)
}
/* Call the appropriate device's interrupt */
}
/* Call the appropriate device's interrupt */
- __do_IRQ(local_irq
, regs
);
+ __do_IRQ(local_irq);
/* set EOI - forces a new interrupt if a lower priority device
* still needs service.
/* set EOI - forces a new interrupt if a lower priority device
* still needs service.
@@
-155,7
+155,7
@@
superio_init(struct pci_dev *pcidev)
struct pci_dev *pdev = sio->lio_pdev;
u16 word;
struct pci_dev *pdev = sio->lio_pdev;
u16 word;
- if (sio->suckyio_irq_enabled)
+ if (sio->suckyio_irq_enabled)
return;
BUG_ON(!pdev);
return;
BUG_ON(!pdev);
@@
-194,7
+194,7
@@
superio_init(struct pci_dev *pcidev)
request_region (sio->acpi_base, 0x1f, "acpi");
/* Enable the legacy I/O function */
request_region (sio->acpi_base, 0x1f, "acpi");
/* Enable the legacy I/O function */
-
pci_read_config_word (pdev, PCI_COMMAND, &word);
+ pci_read_config_word (pdev, PCI_COMMAND, &word);
word |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_IO;
pci_write_config_word (pdev, PCI_COMMAND, word);
word |= PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_IO;
pci_write_config_word (pdev, PCI_COMMAND, word);
@@
-271,7
+271,7
@@
superio_init(struct pci_dev *pcidev)
else
printk(KERN_ERR PFX "USB regulator not initialized!\n");
else
printk(KERN_ERR PFX "USB regulator not initialized!\n");
- if (request_irq(pdev->irq, superio_interrupt,
SA_INTERRUPT
,
+ if (request_irq(pdev->irq, superio_interrupt,
IRQF_DISABLED
,
SUPERIO, (void *)sio)) {
printk(KERN_ERR PFX "could not get irq\n");
SUPERIO, (void *)sio)) {
printk(KERN_ERR PFX "could not get irq\n");
@@
-360,7
+360,7
@@
int superio_fixup_irq(struct pci_dev *pcidev)
#endif
for (i = 0; i < 16; i++) {
#endif
for (i = 0; i < 16; i++) {
- irq_desc[i].
handler
= &superio_interrupt_type;
+ irq_desc[i].
chip
= &superio_interrupt_type;
}
/*
}
/*