patch-2.2.0-pre2 linux/drivers/char/ftape/lowlevel/fdc-io.c

• Lines: 43
• Date: Tue Dec 29 11:27:38 1998
• Orig file: v2.2.0-pre1/linux/drivers/char/ftape/lowlevel/fdc-io.c
• Orig date: Thu Nov 12 16:21:19 1998

diff -u --recursive --new-file v2.2.0-pre1/linux/drivers/char/ftape/lowlevel/fdc-io.c linux/drivers/char/ftape/lowlevel/fdc-io.c
@@ -1348,21 +1348,12 @@
 	if (fdc.hook == &do_ftape) {
 		/*  Get fast interrupt handler.
 		 */
-#if LINUX_VERSION_CODE >= KERNEL_VER(1,3,70)
 		if (request_irq(fdc.irq, ftape_interrupt,
 				SA_INTERRUPT, "ft", ftape_id)) {
 			TRACE_ABORT(-EIO, ft_t_bug,
 				    "Unable to grab IRQ%d for ftape driver",
 				    fdc.irq);
 		}
-#else
-		if (request_irq(fdc.irq, ftape_interrupt, SA_INTERRUPT,
-				ftape_id)) {
-			TRACE_ABORT(-EIO, ft_t_bug,
-				    "Unable to grab IRQ%d for ftape driver",
-				    fdc.irq);
-		}
-#endif
 		if (request_dma(fdc.dma, ftape_id)) {
 #if LINUX_VERSION_CODE >= KERNEL_VER(1,3,70)
 			free_irq(fdc.irq, ftape_id);
@@ -1373,7 +1364,6 @@
 			      "Unable to grab DMA%d for ftape driver",
 			      fdc.dma);
 		}
-		enable_irq(fdc.irq);
 	}
 	if (ft_fdc_base != 0x3f0 && (ft_fdc_dma == 2 || ft_fdc_irq == 6)) {
 		/* Using same dma channel or irq as standard fdc, need
@@ -1395,12 +1385,7 @@
 	if (fdc.hook == &do_ftape) {
 		disable_dma(fdc.dma);	/* just in case... */
 		free_dma(fdc.dma);
-		disable_irq(fdc.irq);
-#if LINUX_VERSION_CODE >= KERNEL_VER(1,3,70)
 		free_irq(fdc.irq, ftape_id);
-#else
-                free_irq(fdc.irq);
-#endif
 	}
 	if (ft_fdc_base != 0x3f0 && (ft_fdc_dma == 2 || ft_fdc_irq == 6)) {
 		/* Using same dma channel as standard fdc, need to