aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport/parport_pc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/parport/parport_pc.c')
-rw-r--r--drivers/parport/parport_pc.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index e2be84001105..e9743d3efaf6 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -272,13 +272,6 @@ static int clear_epp_timeout(struct parport *pb)
272 * of these are in parport_pc.h. 272 * of these are in parport_pc.h.
273 */ 273 */
274 274
275static irqreturn_t parport_pc_interrupt(int irq, void *dev_id)
276{
277 parport_generic_irq(irq, (struct parport *) dev_id);
278 /* FIXME! Was it really ours? */
279 return IRQ_HANDLED;
280}
281
282static void parport_pc_init_state(struct pardevice *dev, struct parport_state *s) 275static void parport_pc_init_state(struct pardevice *dev, struct parport_state *s)
283{ 276{
284 s->u.pc.ctr = 0xc; 277 s->u.pc.ctr = 0xc;
@@ -2301,7 +2294,7 @@ struct parport *parport_pc_probe_port (unsigned long int base,
2301 EPP_res = NULL; 2294 EPP_res = NULL;
2302 } 2295 }
2303 if (p->irq != PARPORT_IRQ_NONE) { 2296 if (p->irq != PARPORT_IRQ_NONE) {
2304 if (request_irq (p->irq, parport_pc_interrupt, 2297 if (request_irq (p->irq, parport_irq_handler,
2305 0, p->name, p)) { 2298 0, p->name, p)) {
2306 printk (KERN_WARNING "%s: irq %d in use, " 2299 printk (KERN_WARNING "%s: irq %d in use, "
2307 "resorting to polled operation\n", 2300 "resorting to polled operation\n",