---

yaml
---
r: 364063
b: refs/heads/master
c: 731ff7e
h: refs/heads/master
i:
  364061: bad4a99
  364059: 1f16270
  364055: d030671
  364047: 974f66c
  364031: c52d921
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8c90a73808f44dd10bcc2dd4bb6f966bc73cfe0
+refs/heads/master: 731ff7e79053c4d740e24e8339e15e0774936202

trunk/drivers/staging/comedi/drivers/c6xdigio.c

@@ -399,7 +399,6 @@ static void board_init(struct comedi_device *dev)
 
 /*
    options[0] - I/O port
-   options[1] - irq
    options[2] - number of encoder chips installed
  */
 
@@ -421,7 +420,6 @@ static int c6xdigio_attach(struct comedi_device *dev,
 {
 	int result = 0;
 	unsigned long iobase;
-	unsigned int irq;
 	struct comedi_subdevice *s;
 
 	iobase = it->options[0];
@@ -439,13 +437,6 @@ static int c6xdigio_attach(struct comedi_device *dev,
 	/*  Make sure that PnP ports get activated */
 	pnp_register_driver(&c6xdigio_pnp_driver);
 
-	irq = it->options[1];
-	if (irq > 0)
-		printk(KERN_DEBUG "comedi%d: irq = %u ignored\n",
-				dev->minor, irq);
-	else if (irq == 0)
-		printk(KERN_DEBUG "comedi%d: no irq\n", dev->minor);
-
 	s = &dev->subdevices[0];
 	/* pwm output subdevice */
 	s->type = COMEDI_SUBD_AO;	/*  Not sure what to put here */
@@ -489,8 +480,6 @@ static void c6xdigio_detach(struct comedi_device *dev)
 {
 	if (dev->iobase)
 		release_region(dev->iobase, C6XDIGIO_SIZE);
-	if (dev->irq)
-		free_irq(dev->irq, dev);
 	pnp_unregister_driver(&c6xdigio_pnp_driver);
 }