projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux into drm...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
parisc
/
eisa.c
diff --git
a/drivers/parisc/eisa.c
b/drivers/parisc/eisa.c
index e860038b0b841952f29021a5fa752f6d9ee4ea3e..103095bbe8c09bd35b5c76e9faff6f62dfeab8a2 100644
(file)
--- a/
drivers/parisc/eisa.c
+++ b/
drivers/parisc/eisa.c
@@
-144,8
+144,9
@@
static unsigned int eisa_irq_level __read_mostly; /* default to edge triggered *
/* called by free irq */
/* called by free irq */
-static void eisa_mask_irq(
unsigned int irq
)
+static void eisa_mask_irq(
struct irq_data *d
)
{
{
+ unsigned int irq = d->irq;
unsigned long flags;
EISA_DBG("disable irq %d\n", irq);
unsigned long flags;
EISA_DBG("disable irq %d\n", irq);
@@
-164,8
+165,9
@@
static void eisa_mask_irq(unsigned int irq)
}
/* called by request irq */
}
/* called by request irq */
-static void eisa_unmask_irq(
unsigned int irq
)
+static void eisa_unmask_irq(
struct irq_data *d
)
{
{
+ unsigned int irq = d->irq;
unsigned long flags;
EISA_DBG("enable irq %d\n", irq);
unsigned long flags;
EISA_DBG("enable irq %d\n", irq);
@@
-183,9
+185,9
@@
static void eisa_unmask_irq(unsigned int irq)
}
static struct irq_chip eisa_interrupt_type = {
}
static struct irq_chip eisa_interrupt_type = {
- .name = "EISA",
- .
unmask
= eisa_unmask_irq,
- .
mask
= eisa_mask_irq,
+ .name
= "EISA",
+ .
irq_unmask
= eisa_unmask_irq,
+ .
irq_mask
= eisa_mask_irq,
};
static irqreturn_t eisa_irq(int wax_irq, void *intr_dev)
};
static irqreturn_t eisa_irq(int wax_irq, void *intr_dev)
@@
-338,7
+340,7
@@
static int __init eisa_probe(struct parisc_device *dev)
/* Reserve IRQ2 */
setup_irq(2, &irq2_action);
for (i = 0; i < 16; i++) {
/* Reserve IRQ2 */
setup_irq(2, &irq2_action);
for (i = 0; i < 16; i++) {
-
set_irq
_chip_and_handler(i, &eisa_interrupt_type,
+
irq_set
_chip_and_handler(i, &eisa_interrupt_type,
handle_simple_irq);
}
handle_simple_irq);
}