Commit 8121975b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Jens Axboe

[PATCH] NCR53C9x unused SCp.have_data_in

NCR53C9x: Remove unused initialization of SCp.have_data_in (from Maciej W.
Rozycki). This affects the following drivers:
  - DECstation SCSI
  - Amiga Oktagon SCSI
parent fe4914db
...@@ -911,7 +911,7 @@ static void esp_get_dmabufs(struct NCR_ESP *esp, Scsi_Cmnd *sp) ...@@ -911,7 +911,7 @@ static void esp_get_dmabufs(struct NCR_ESP *esp, Scsi_Cmnd *sp)
if (esp->dma_mmu_get_scsi_one) if (esp->dma_mmu_get_scsi_one)
esp->dma_mmu_get_scsi_one(esp, sp); esp->dma_mmu_get_scsi_one(esp, sp);
else else
sp->SCp.have_data_in = (int) sp->SCp.ptr = sp->SCp.ptr =
(char *) virt_to_phys(sp->request_buffer); (char *) virt_to_phys(sp->request_buffer);
} else { } else {
sp->SCp.buffer = (struct scatterlist *) sp->buffer; sp->SCp.buffer = (struct scatterlist *) sp->buffer;
......
...@@ -348,7 +348,7 @@ static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count) ...@@ -348,7 +348,7 @@ static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count)
static void dma_drain(struct NCR_ESP *esp) static void dma_drain(struct NCR_ESP *esp)
{ {
unsigned long nw = *scsi_scr; unsigned long nw = *scsi_scr;
unsigned short *p = KSEG1ADDR((unsigned short *) ((*scsi_dma_ptr) >> 3)); unsigned short *p = (unsigned short *)KSEG1ADDR((*scsi_dma_ptr) >> 3);
/* /*
* Is there something in the dma buffers left? * Is there something in the dma buffers left?
...@@ -478,8 +478,7 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) ...@@ -478,8 +478,7 @@ static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write)
*/ */
static void dma_mmu_get_scsi_one(struct NCR_ESP *esp, Scsi_Cmnd * sp) static void dma_mmu_get_scsi_one(struct NCR_ESP *esp, Scsi_Cmnd * sp)
{ {
sp->SCp.have_data_in = PHYSADDR(sp->SCp.buffer); sp->SCp.ptr = (char *)PHYSADDR(sp->SCp.buffer);
sp->SCp.ptr = (char *) ((unsigned long) sp->SCp.have_data_in);
} }
static void dma_mmu_get_scsi_sgl(struct NCR_ESP *esp, Scsi_Cmnd * sp) static void dma_mmu_get_scsi_sgl(struct NCR_ESP *esp, Scsi_Cmnd * sp)
...@@ -523,8 +522,8 @@ static void pmaz_dma_init_write(struct NCR_ESP *esp, __u32 vaddress, int length) ...@@ -523,8 +522,8 @@ static void pmaz_dma_init_write(struct NCR_ESP *esp, __u32 vaddress, int length)
{ {
volatile int *dmareg = (volatile int *) ( esp->slot + DEC_SCSI_DMAREG ); volatile int *dmareg = (volatile int *) ( esp->slot + DEC_SCSI_DMAREG );
memcpy((void *) (esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE), memcpy((void *)(esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE),
KSEG0ADDR((void *) vaddress), length); (void *)KSEG0ADDR(vaddress), length);
*dmareg = TC_ESP_DMAR_WRITE | *dmareg = TC_ESP_DMAR_WRITE |
TC_ESP_DMA_ADDR(esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE); TC_ESP_DMA_ADDR(esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE);
...@@ -554,7 +553,5 @@ static void pmaz_dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write ...@@ -554,7 +553,5 @@ static void pmaz_dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write
static void pmaz_dma_mmu_get_scsi_one(struct NCR_ESP *esp, Scsi_Cmnd * sp) static void pmaz_dma_mmu_get_scsi_one(struct NCR_ESP *esp, Scsi_Cmnd * sp)
{ {
sp->SCp.have_data_in = (int) sp->SCp.ptr = sp->SCp.ptr = (char *)KSEG0ADDR((sp->request_buffer));
(char *) KSEG0ADDR((sp->request_buffer));
} }
...@@ -550,7 +550,7 @@ static void dma_invalidate(struct NCR_ESP *esp) ...@@ -550,7 +550,7 @@ static void dma_invalidate(struct NCR_ESP *esp)
void dma_mmu_get_scsi_one(struct NCR_ESP *esp, Scsi_Cmnd *sp) void dma_mmu_get_scsi_one(struct NCR_ESP *esp, Scsi_Cmnd *sp)
{ {
sp->SCp.have_data_in = (int) sp->SCp.ptr = sp->SCp.ptr =
sp->request_buffer; sp->request_buffer;
} }
......
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