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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
scsi
/
sun3x_esp.c
diff --git
a/drivers/scsi/sun3x_esp.c
b/drivers/scsi/sun3x_esp.c
index
f2b934c
..
6b60536
100644
(file)
--- a/
drivers/scsi/sun3x_esp.c
+++ b/
drivers/scsi/sun3x_esp.c
@@
-23,8
+23,6
@@
#include <asm/dvma.h>
#include <asm/irq.h>
#include <asm/dvma.h>
#include <asm/irq.h>
-extern struct NCR_ESP *espchain;
-
static void dma_barrier(struct NCR_ESP *esp);
static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp);
static void dma_barrier(struct NCR_ESP *esp);
static int dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp);
@@
-49,7
+47,7
@@
static void dma_advance_sg (Scsi_Cmnd *sp);
/* Detecting ESP chips on the machine. This is the simple and easy
* version.
*/
/* Detecting ESP chips on the machine. This is the simple and easy
* version.
*/
-int sun3x_esp_detect(
Scsi_Host_T
emplate *tpnt)
+int sun3x_esp_detect(
struct scsi_host_t
emplate *tpnt)
{
struct NCR_ESP *esp;
struct ConfigDev *esp_dev;
{
struct NCR_ESP *esp;
struct ConfigDev *esp_dev;
@@
-99,7
+97,7
@@
int sun3x_esp_detect(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,
SA_INTERRUPT,
+ if (request_irq(esp->irq, esp_intr,
IRQF_DISABLED,
"SUN3X SCSI", esp->ehost)) {
esp_deallocate(esp);
return 0;
"SUN3X SCSI", esp->ehost)) {
esp_deallocate(esp);
return 0;
@@
-334,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].d
v
ma_address = dvma_map((unsigned long)page_address(sg[sz].page) +
+ sg[sz].dma_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->d
v
ma_address);
+ sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dma_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)
@@
-349,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->buffer;
+ struct scatterlist *sg = (struct scatterlist *)sp->
request_
buffer;
while(sz >= 0) {
while(sz >= 0) {
- dvma_unmap((char *)sg[sz].d
v
ma_address);
+ dvma_unmap((char *)sg[sz].dma_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->d
v
ma_address);
+ sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dma_address);
}
static int sun3x_esp_release(struct Scsi_Host *instance)
}
static int sun3x_esp_release(struct Scsi_Host *instance)
@@
-369,8
+367,8
@@
static int sun3x_esp_release(struct Scsi_Host *instance)
}
}
-static
Scsi_Host_T
emplate driver_template = {
- .proc_name = "esp",
+static
struct scsi_host_t
emplate driver_template = {
+ .proc_name = "
sun3x_
esp",
.proc_info = &esp_proc_info,
.name = "Sun ESP 100/100a/200",
.detect = sun3x_esp_detect,
.proc_info = &esp_proc_info,
.name = "Sun ESP 100/100a/200",
.detect = sun3x_esp_detect,