patch-1.3.70 linux/drivers/cdrom/mcdx.c

• Lines: 36
• Date: Fri Mar 1 07:50:40 1996
• Orig file: v1.3.69/linux/drivers/cdrom/mcdx.c
• Orig date: Tue Jan 23 21:15:39 1996

diff -u --recursive --new-file v1.3.69/linux/drivers/cdrom/mcdx.c linux/drivers/cdrom/mcdx.c
@@ -191,7 +191,7 @@
 	structure fops. */
 
 /* ???  exported by the mcdx_sigaction struct */
-static void mcdx_intr(int, struct pt_regs*);
+static void mcdx_intr(int, void *, struct pt_regs*);
 
 /* exported by file_ops */
 static int mcdx_open(struct inode*, struct file*);
@@ -835,7 +835,7 @@
 }
 
 static void 
-mcdx_intr(int irq, struct pt_regs* regs)
+mcdx_intr(int irq, void *dev_id, struct pt_regs* regs)
 {
     struct s_drive_stuff *stuffp;
 	unsigned char x;
@@ -1002,7 +1002,7 @@
 		stuffp = mcdx_stuffp[i];
 		if (!stuffp) continue;
 		release_region((unsigned long) stuffp->wreg_data, MCDX_IO_SIZE);
-		free_irq(stuffp->irq);
+		free_irq(stuffp->irq, NULL);
 		if (stuffp->toc) {
 			TRACE((MALLOC, "cleanup_module() free toc @ %p\n", stuffp->toc));
 			kfree(stuffp->toc);
@@ -1170,7 +1170,7 @@
 
 		TRACE((INIT, "init() subscribe irq and i/o\n"));
 		mcdx_irq_map[stuffp->irq] = stuffp;
-		if (request_irq(stuffp->irq, mcdx_intr, SA_INTERRUPT, DEVICE_NAME)) {
+		if (request_irq(stuffp->irq, mcdx_intr, SA_INTERRUPT, DEVICE_NAME, NULL)) {
             WARN(("%s=0x%3p,%d: Init failed. Can't get irq (%d).\n",
                     MCDX,
                     stuffp->wreg_data, stuffp->irq, stuffp->irq));