X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fparport%2Fparport_ax88796.c;h=4ec220b2eae7dba0bf61481931209fbc08f8d2fc;hb=ec42418f1973e1f77da1fcca3be59c0acb878a9d;hp=4baa719439a2fe4db93e349996d908769797c490;hpb=61b9175808670d9abf52156803ae0ed1e3706ac4;p=linux-2.6 diff --git a/drivers/parport/parport_ax88796.c b/drivers/parport/parport_ax88796.c index 4baa719439..4ec220b2ea 100644 --- a/drivers/parport/parport_ax88796.c +++ b/drivers/parport/parport_ax88796.c @@ -232,14 +232,6 @@ parport_ax88796_restore_state(struct parport *p, struct parport_state *s) writeb(s->u.ax88796.cpr, dd->spp_cpr); } -static irqreturn_t -parport_ax88796_interrupt(int irq, void *dev_id, struct pt_regs *regs) -{ - parport_generic_irq(irq, dev_id, regs); - return IRQ_HANDLED; -} - - static struct parport_operations parport_ax88796_ops = { .write_data = parport_ax88796_write_data, .read_data = parport_ax88796_read_data, @@ -344,8 +336,8 @@ static int parport_ax88796_probe(struct platform_device *pdev) if (irq >= 0) { /* request irq */ - ret = request_irq(irq, parport_ax88796_interrupt, - SA_TRIGGER_FALLING, pdev->name, pp); + ret = request_irq(irq, parport_irq_handler, + IRQF_TRIGGER_FALLING, pdev->name, pp); if (ret < 0) goto exit_port;