git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
scsi
/
sun3x_esp.c
diff --git
a/drivers/scsi/sun3x_esp.c
b/drivers/scsi/sun3x_esp.c
index
6b60536
..
cc990be
100644
(file)
--- a/
drivers/scsi/sun3x_esp.c
+++ b/
drivers/scsi/sun3x_esp.c
@@
-97,7
+97,7
@@
int sun3x_esp_detect(struct scsi_host_template *tpnt)
esp->esp_command_dvma = dvma_vtob((unsigned long)esp->esp_command);
esp->irq = 2;
esp->esp_command_dvma = dvma_vtob((unsigned long)esp->esp_command);
esp->irq = 2;
- if (request_irq(esp->irq, esp_intr,
IRQF_DISABLED,
+ if (request_irq(esp->irq, esp_intr,
SA_INTERRUPT,
"SUN3X SCSI", esp->ehost)) {
esp_deallocate(esp);
return 0;
"SUN3X SCSI", esp->ehost)) {
esp_deallocate(esp);
return 0;
@@
-332,11
+332,11
@@
static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)
struct scatterlist *sg = sp->SCp.buffer;
while (sz >= 0) {
struct scatterlist *sg = sp->SCp.buffer;
while (sz >= 0) {
- sg[sz].dma_address = dvma_map((unsigned long)page_address(sg[sz].page) +
+ sg[sz].d
v
ma_address = dvma_map((unsigned long)page_address(sg[sz].page) +
sg[sz].offset, sg[sz].length);
sz--;
}
sg[sz].offset, sg[sz].length);
sz--;
}
- sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dma_address);
+ sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->d
v
ma_address);
}
static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp)
}
static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp)
@@
-347,17
+347,17
@@
static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp)
static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)
{
int sz = sp->use_sg - 1;
static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)
{
int sz = sp->use_sg - 1;
- struct scatterlist *sg = (struct scatterlist *)sp->
request_
buffer;
+ struct scatterlist *sg = (struct scatterlist *)sp->buffer;
while(sz >= 0) {
while(sz >= 0) {
- dvma_unmap((char *)sg[sz].dma_address);
+ dvma_unmap((char *)sg[sz].d
v
ma_address);
sz--;
}
}
static void dma_advance_sg (Scsi_Cmnd *sp)
{
sz--;
}
}
static void dma_advance_sg (Scsi_Cmnd *sp)
{
- sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dma_address);
+ sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->d
v
ma_address);
}
static int sun3x_esp_release(struct Scsi_Host *instance)
}
static int sun3x_esp_release(struct Scsi_Host *instance)