patch-2.1.89 linux/drivers/scsi/scsiiom.c

• Lines: 62
• Date: Wed Feb 25 19:50:22 1998
• Orig file: v2.1.88/linux/drivers/scsi/scsiiom.c
• Orig date: Tue May 13 22:41:13 1997

diff -u --recursive --new-file v2.1.88/linux/drivers/scsi/scsiiom.c linux/drivers/scsi/scsiiom.c
@@ -175,13 +175,8 @@
 }
 
 
-#ifndef  VERSION_ELF_1_2_13
 static void
 DC390_Interrupt( int irq, void *dev_id, struct pt_regs *regs)
-#else
-static void
-DC390_Interrupt( int irq, struct pt_regs *regs)
-#endif
 {
     PACB   pACB;
     PDCB   pDCB;
@@ -303,11 +298,7 @@
 		pSRB->pSegmentList++;
 		psgl = pSRB->pSegmentList;
 
-#ifndef VERSION_ELF_1_2_13
 		pSRB->SGPhysAddr = virt_to_phys( psgl->address );
-#else
-		pSRB->SGPhysAddr = (ULONG) psgl->address;
-#endif
 		pSRB->SGToBeXferLen = (ULONG) psgl->length;
 	    }
 	    else
@@ -368,11 +359,7 @@
 		pSRB->pSegmentList++;
 		psgl = pSRB->pSegmentList;
 
-#ifndef VERSION_ELF_1_2_13
 		pSRB->SGPhysAddr = virt_to_phys( psgl->address );
-#else
-		pSRB->SGPhysAddr = (ULONG) psgl->address;
-#endif
 		pSRB->SGToBeXferLen = (ULONG) psgl->length;
 	    }
 	    else
@@ -427,11 +414,7 @@
 	    if( residual )
 	    {
 		bval = inb(ioport+ScsiFifo);	    /* get residual byte */
-#ifndef VERSION_ELF_1_2_13
 		ptr = (PUCHAR) phys_to_virt( pSRB->SGPhysAddr );
-#else
-		ptr = (PUCHAR) pSRB->SGPhysAddr;
-#endif
 		*ptr = bval;
 		pSRB->SGPhysAddr++;
 		pSRB->TotalXferredLen++;
@@ -643,11 +626,7 @@
 	if( !pSRB->SGToBeXferLen )
 	{
 	    psgl = pSRB->pSegmentList;
-#ifndef VERSION_ELF_1_2_13
 	    pSRB->SGPhysAddr = virt_to_phys( psgl->address );
-#else
-	    pSRB->SGPhysAddr = (ULONG) psgl->address;
-#endif
 	    pSRB->SGToBeXferLen = (ULONG) psgl->length;
 	}
 	lval = pSRB->SGToBeXferLen;