[Linux-mips-commits]CVS: linux/drivers/scsi ncr53c8xx.c,1.5,1.6

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/scsi
In directory usw-pr-cvs1:/tmp/cvs-serv3535/drivers/scsi

Modified Files:
	ncr53c8xx.c 
Log Message:
More OSS syncing..



Index: ncr53c8xx.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/scsi/ncr53c8xx.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ncr53c8xx.c	26 Feb 2002 19:03:29 -0000	1.5
+++ ncr53c8xx.c	21 Apr 2002 20:01:15 -0000	1.6
@@ -162,11 +162,6 @@
 
 #include <linux/types.h>
 
-#ifdef CONFIG_COBALT_27
-/* COBALT LOCAL: Needed because our mips is not DMA coherent. -DaveM */
-#define CACHED_TO_UNCACHED(x) (((unsigned long)(x) & (unsigned long)0x1fffffff) + KSEG1)
-#endif
-
 /*
 **	Define BITS_PER_LONG for earlier linux versions.
 */
@@ -3576,11 +3571,6 @@
 	np = __m_calloc_dma(device->pdev, sizeof(struct ncb), "NCB");
 	if (!np)
 		goto attach_error;
-#ifdef CONFIG_COBALT_27
-        /* COBALT LOCAL: We're not DMA coherent, so reference in uncached space -DaveM */
-        dma_cache_wback_inv((unsigned long)np, sizeof(*np));
-        np = (ncb_p) CACHED_TO_UNCACHED(np);
-#endif
 	NCR_INIT_LOCK_NCB(np);
 	np->pdev  = device->pdev;
 	np->p_ncb = vtobus(np);
@@ -3592,11 +3582,6 @@
 	np->ccb = (ccb_p) m_calloc_dma(sizeof(struct ccb), "CCB");
 	if (!np->ccb)
 		goto attach_error;
-#ifdef CONFIG_COBALT_27
-        /* COBALT LOCAL: We're not DMA coherent, so reference in uncached space -DaveM */
-        dma_cache_wback_inv((unsigned long)np->ccb, sizeof(*np->ccb));
-        np->ccb = (ccb_p) CACHED_TO_UNCACHED(np->ccb);
-#endif
 
 	/*
 	**	Store input informations in the host data structure.
@@ -3626,13 +3611,6 @@
 			m_calloc_dma(sizeof(struct scripth), "SCRIPTH");
 	if (!np->scripth0)
 		goto attach_error;
-#ifdef CONFIG_COBALT_27
-        /* COBALT LOCAL: We're not DMA coherent, so reference in uncached space . -DaveM */
-        dma_cache_wback_inv((unsigned long)np->script0, sizeof(*np->script0));
-        np->script0 = (struct script *) CACHED_TO_UNCACHED(np->script0);
-        dma_cache_wback_inv((unsigned long)np->scripth0, sizeof(*np->scripth0));
-        np->scripth0 = (struct scripth *) CACHED_TO_UNCACHED(np->scripth0);
-#endif
 
 	/*
 	**    Initialize timer structure
@@ -4583,9 +4561,6 @@
 	memcpy(cp->cdb_buf, cmd->cmnd, MIN(cmd->cmd_len, sizeof(cp->cdb_buf)));
 	cp->phys.cmd.addr		= cpu_to_scr(CCB_PHYS (cp, cdb_buf[0]));
 	cp->phys.cmd.size		= cpu_to_scr(cmd->cmd_len);
-#ifdef CONFIG_COBALT_27
-        dma_cache_wback_inv((unsigned long)&cmd->cmnd[0], sizeof(cmd->cmnd));
-#endif
 
 	/*
 	**	status
@@ -7037,10 +7012,6 @@
 		bzero(cp->sense_buf, sizeof(cp->sense_buf));
 		cp->phys.sense.addr	= cpu_to_scr(CCB_PHYS(cp,sense_buf[0]));
 		cp->phys.sense.size	= cpu_to_scr(sizeof(cp->sense_buf));
-#ifdef CONFIG_COBALT_27
-               	dma_cache_wback_inv((unsigned long)&cp->sense_buf[0],
-                                		sizeof(cp->sense_buf));
-#endif
 		
 		/*
 		**	requeue the command.
@@ -7823,11 +7794,6 @@
 	lp->actccbs++;
 	np->actccbs++;
 	bzero (cp, sizeof (*cp));
-#ifdef CONFIG_COBALT_27
-        /* COBALT LOCAL: We're not DMA coherent, so reference in uncached space -DaveM */
-        dma_cache_wback_inv((unsigned long)cp, sizeof(*cp));
-        cp = (ccb_p) CACHED_TO_UNCACHED(cp);
-#endif
 	ncr_init_ccb(np, cp);
 
 	/*
@@ -8157,10 +8123,6 @@
 			data = &data[MAX_SCATTER - 1];
 			data[0].addr = cpu_to_scr(baddr);
 			data[0].size = cpu_to_scr(cmd->request_bufflen);
-#ifdef CONFIG_COBALT_27
-                        dma_cache_wback_inv((unsigned long)cmd->request_buffer,
-                                                cmd->request_bufflen);
-#endif
 			cp->data_len = cmd->request_bufflen;
 			segment = 1;
 		}
@@ -8178,9 +8140,6 @@
 			data[segment].addr = cpu_to_scr(baddr);
 			data[segment].size = cpu_to_scr(len);
 			cp->data_len	  += len;
-#ifdef CONFIG_COBALT_27
-                        dma_cache_wback_inv((unsigned long)scatter[segment].address, scatter[segment].length);
-#endif
 			++segment;
 		}
 	}