[PATCH] NCR53C9x unused SCp.have_data_in

• Next message: Geert Uytterhoeven: "[PATCH] M68k RTC updates"
• Previous message: Geert Uytterhoeven: "[PATCH] M68k show_stack() portability and cleanup patch"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

NCR53C9x: Remove unused initialization of SCp.have_data_in (from Maciej W.
Rozycki). This affects the following drivers:
  - DECstation SCSI
  - Amiga Oktagon SCSI

--- linux-2.6.x/drivers/scsi/NCR53C9x.c 2002-09-12 03:20:28.000000000 +0000
+++ linux-m68k-2.6.x/drivers/scsi/NCR53C9x.c 2002-10-22 23:02:09.000000000 +0000
@@ -917,7 +917,7 @@ static void esp_get_dmabufs(struct NCR_E
                 if (esp->dma_mmu_get_scsi_one)
                         esp->dma_mmu_get_scsi_one(esp, sp);
                 else
- sp->SCp.have_data_in = (int) sp->SCp.ptr =
+ sp->SCp.ptr =
                                 (char *) virt_to_phys(sp->request_buffer);
         } else {
                 sp->SCp.buffer = (struct scatterlist *) sp->buffer;
--- linux-2.6.x/drivers/scsi/dec_esp.c 2002-10-02 17:22:42.000000000 +0000
+++ linux-m68k-2.6.x/drivers/scsi/dec_esp.c 2002-10-22 23:49:24.000000000 +0000
@@ -323,7 +323,7 @@ static int dma_bytes_sent(struct NCR_ESP
 static void dma_drain(struct NCR_ESP *esp)
 {
         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?
@@ -437,8 +437,7 @@ static void dma_setup(struct NCR_ESP *es
  */
 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 *) ((unsigned long) sp->SCp.have_data_in);
+ sp->SCp.ptr = (char *)PHYSADDR(sp->SCp.buffer);
 }
 
 static void dma_mmu_get_scsi_sgl(struct NCR_ESP *esp, Scsi_Cmnd * sp)
@@ -484,8 +483,8 @@ static void pmaz_dma_init_write(struct N
 {
         volatile int *dmareg = (volatile int *) ( esp->slot + DEC_SCSI_DMAREG );
 
- memcpy((void *) (esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE),
- KSEG0ADDR((void *) vaddress), length);
+ memcpy((void *)(esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE),
+ (void *)KSEG0ADDR(vaddress), length);
 
         *dmareg = TC_ESP_DMAR_WRITE |
                 TC_ESP_DMA_ADDR(esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE);
@@ -516,7 +515,5 @@ static void pmaz_dma_setup(struct NCR_ES
 
 static void pmaz_dma_mmu_get_scsi_one(struct NCR_ESP *esp, Scsi_Cmnd * sp)
 {
- sp->SCp.have_data_in = (int) sp->SCp.ptr =
- (char *) KSEG0ADDR((sp->request_buffer));
+ sp->SCp.ptr = (char *)KSEG0ADDR((sp->request_buffer));
 }
-
--- linux-2.6.x/drivers/scsi/oktagon_esp.c Thu Jun 27 02:59:32 2002
+++ linux-m68k-2.6.x/drivers/scsi/oktagon_esp.c Mon Nov 25 12:11:43 2002
@@ -548,7 +548,7 @@ static void dma_invalidate(struct NCR_ES
 
 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;
 }
 

Gr{oetje,eeting}s,

                                                Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

• Next message: Geert Uytterhoeven: "[PATCH] M68k RTC updates"
• Previous message: Geert Uytterhoeven: "[PATCH] M68k show_stack() portability and cleanup patch"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Thu Jul 31 2003 - 22:00:28 EST