Commit e4ac3051 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by James Bottomley

[PATCH] tmscsim: remove legacy and void code

This one is purely cosmetic - it removes legacy (pre 2.4) and some void
(e.g. #defined as nothing locks) code. So, it doesn't affect the resulting
object file.
parent d1fef10e
...@@ -227,7 +227,7 @@ DC390_Interrupt( int irq, void *dev_id, struct pt_regs *regs) ...@@ -227,7 +227,7 @@ DC390_Interrupt( int irq, void *dev_id, struct pt_regs *regs)
#if DMA_INT #if DMA_INT
UCHAR dstatus; UCHAR dstatus;
#endif #endif
DC390_AFLAGS DC390_IFLAGS; //DC390_DFLAGS DC390_IFLAGS;
pACB = (PACB)dev_id; pACB = (PACB)dev_id;
for (pACB2 = dc390_pACB_start; (pACB2 && pACB2 != pACB); pACB2 = pACB2->pNextACB); for (pACB2 = dc390_pACB_start; (pACB2 && pACB2 != pACB); pACB2 = pACB2->pNextACB);
...@@ -237,26 +237,21 @@ DC390_Interrupt( int irq, void *dev_id, struct pt_regs *regs) ...@@ -237,26 +237,21 @@ DC390_Interrupt( int irq, void *dev_id, struct pt_regs *regs)
return IRQ_NONE; return IRQ_NONE;
} }
//DC390_LOCK_DRV;
sstatus = DC390_read8 (Scsi_Status); sstatus = DC390_read8 (Scsi_Status);
if( !(sstatus & INTERRUPT) ) if( !(sstatus & INTERRUPT) )
{ /*DC390_UNLOCK_DRV;*/ return IRQ_NONE; }; return IRQ_NONE;
DEBUG1(printk (KERN_DEBUG "sstatus=%02x,", sstatus)); DEBUG1(printk (KERN_DEBUG "sstatus=%02x,", sstatus));
#if DMA_INT #if DMA_INT
DC390_LOCK_IO(pACB->pScsiHost); DC390_LOCK_IO(pACB->pScsiHost);
DC390_LOCK_ACB;
dstatus = dc390_dma_intr (pACB); dstatus = dc390_dma_intr (pACB);
DC390_UNLOCK_ACB;
DC390_UNLOCK_IO(pACB->pScsiHost); DC390_UNLOCK_IO(pACB->pScsiHost);
DEBUG1(printk (KERN_DEBUG "dstatus=%02x,", dstatus)); DEBUG1(printk (KERN_DEBUG "dstatus=%02x,", dstatus));
if (! (dstatus & SCSI_INTERRUPT)) if (! (dstatus & SCSI_INTERRUPT))
{ {
DEBUG0(printk (KERN_WARNING "DC390 Int w/o SCSI actions (only DMA?)\n")); DEBUG0(printk (KERN_WARNING "DC390 Int w/o SCSI actions (only DMA?)\n"));
//DC390_UNLOCK_DRV;
return IRQ_NONE; return IRQ_NONE;
}; };
#else #else
...@@ -266,8 +261,6 @@ DC390_Interrupt( int irq, void *dev_id, struct pt_regs *regs) ...@@ -266,8 +261,6 @@ DC390_Interrupt( int irq, void *dev_id, struct pt_regs *regs)
#endif #endif
DC390_LOCK_IO(pACB->pScsiHost); DC390_LOCK_IO(pACB->pScsiHost);
DC390_LOCK_ACB;
//DC390_UNLOCK_DRV_NI; /* Allow _other_ CPUs to process IRQ (useful for shared IRQs) */
istate = DC390_read8 (Intern_State); istate = DC390_read8 (Intern_State);
istatus = DC390_read8 (INT_Status); /* This clears Scsi_Status, Intern_State and INT_Status ! */ istatus = DC390_read8 (INT_Status); /* This clears Scsi_Status, Intern_State and INT_Status ! */
...@@ -339,10 +332,7 @@ DC390_Interrupt( int irq, void *dev_id, struct pt_regs *regs) ...@@ -339,10 +332,7 @@ DC390_Interrupt( int irq, void *dev_id, struct pt_regs *regs)
} }
unlock: unlock:
//DC390_LOCK_DRV_NI;
DC390_UNLOCK_ACB;
DC390_UNLOCK_IO(pACB->pScsiHost); DC390_UNLOCK_IO(pACB->pScsiHost);
//DC390_UNLOCK_DRV; /* Restore initial flags */
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -1620,18 +1610,14 @@ dc390_SRBdone( PACB pACB, PDCB pDCB, PSRB pSRB ) ...@@ -1620,18 +1610,14 @@ dc390_SRBdone( PACB pACB, PDCB pDCB, PSRB pSRB )
pACB->scan_devices = 0; pACB->scan_devices = 0;
}; };
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,3,30)
pcmd->resid = pcmd->request_bufflen - pSRB->TotalXferredLen; pcmd->resid = pcmd->request_bufflen - pSRB->TotalXferredLen;
#endif
if (!DCB_removed) dc390_Going_remove (pDCB, pSRB); if (!DCB_removed) dc390_Going_remove (pDCB, pSRB);
/* Add to free list */ /* Add to free list */
dc390_Free_insert (pACB, pSRB); dc390_Free_insert (pACB, pSRB);
DEBUG0(printk (KERN_DEBUG "DC390: SRBdone: done pid %li\n", pcmd->pid)); DEBUG0(printk (KERN_DEBUG "DC390: SRBdone: done pid %li\n", pcmd->pid));
DC390_UNLOCK_ACB_NI;
pcmd->scsi_done (pcmd); pcmd->scsi_done (pcmd);
DC390_LOCK_ACB_NI;
dc390_Waiting_process (pACB); dc390_Waiting_process (pACB);
return; return;
...@@ -1668,9 +1654,7 @@ dc390_DoingSRB_Done( PACB pACB, PSCSICMD cmd ) ...@@ -1668,9 +1654,7 @@ dc390_DoingSRB_Done( PACB pACB, PSCSICMD cmd )
/* ReleaseSRB( pDCB, pSRB ); */ /* ReleaseSRB( pDCB, pSRB ); */
DEBUG0(printk (KERN_DEBUG "DC390: DoingSRB_Done: done pid %li\n", pcmd->pid)); DEBUG0(printk (KERN_DEBUG "DC390: DoingSRB_Done: done pid %li\n", pcmd->pid));
DC390_UNLOCK_ACB_NI;
pcmd->scsi_done( pcmd ); pcmd->scsi_done( pcmd );
DC390_LOCK_ACB_NI;
#endif #endif
psrb = psrb2; psrb = psrb2;
} }
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment