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
/
jazz_esp.c
diff --git
a/drivers/scsi/jazz_esp.c
b/drivers/scsi/jazz_esp.c
index
fcd304e
..
bfac444
100644
(file)
--- a/
drivers/scsi/jazz_esp.c
+++ b/
drivers/scsi/jazz_esp.c
@@
-52,7
+52,6
@@
static volatile unsigned char cmd_buffer[16];
* via PIO.
*/
* via PIO.
*/
-int jazz_esp_detect(struct scsi_host_template *tpnt);
static int jazz_esp_release(struct Scsi_Host *shost)
{
if (shost->irq)
static int jazz_esp_release(struct Scsi_Host *shost)
{
if (shost->irq)
@@
-75,7
+74,7
@@
static int jazz_esp_detect(struct scsi_host_template *tpnt)
* first assumption it is there:-)
*/
if (1) {
* first assumption it is there:-)
*/
if (1) {
- esp_dev =
0
;
+ esp_dev =
NULL
;
esp = esp_allocate(tpnt, (void *) esp_dev);
/* Do command transfer with programmed I/O */
esp = esp_allocate(tpnt, (void *) esp_dev);
/* Do command transfer with programmed I/O */
@@
-94,13
+93,13
@@
static int jazz_esp_detect(struct scsi_host_template *tpnt)
esp->dma_setup = &dma_setup;
/* Optional functions */
esp->dma_setup = &dma_setup;
/* Optional functions */
- esp->dma_barrier =
0
;
- esp->dma_drain =
0
;
- esp->dma_invalidate =
0
;
- esp->dma_irq_entry =
0
;
- esp->dma_irq_exit =
0
;
- esp->dma_poll =
0
;
- esp->dma_reset =
0
;
+ esp->dma_barrier =
NULL
;
+ esp->dma_drain =
NULL
;
+ esp->dma_invalidate =
NULL
;
+ esp->dma_irq_entry =
NULL
;
+ esp->dma_irq_exit =
NULL
;
+ esp->dma_poll =
NULL
;
+ esp->dma_reset =
NULL
;
esp->dma_led_off = &dma_led_off;
esp->dma_led_on = &dma_led_on;
esp->dma_led_off = &dma_led_off;
esp->dma_led_on = &dma_led_on;
@@
-120,7
+119,7
@@
static int jazz_esp_detect(struct scsi_host_template *tpnt)
* of DMA channel, so we can use the jazz DMA functions
*
*/
* of DMA channel, so we can use the jazz DMA functions
*
*/
- esp->dregs = JAZZ_SCSI_DMA;
+ esp->dregs =
(void *)
JAZZ_SCSI_DMA;
/* ESP register base */
esp->eregs = (struct ESP_regs *)(JAZZ_SCSI_BASE);
/* ESP register base */
esp->eregs = (struct ESP_regs *)(JAZZ_SCSI_BASE);
@@
-132,7
+131,7
@@
static int jazz_esp_detect(struct scsi_host_template *tpnt)
esp->esp_command_dvma = vdma_alloc(CPHYSADDR(cmd_buffer), sizeof (cmd_buffer));
esp->irq = JAZZ_SCSI_IRQ;
esp->esp_command_dvma = vdma_alloc(CPHYSADDR(cmd_buffer), sizeof (cmd_buffer));
esp->irq = JAZZ_SCSI_IRQ;
- request_irq(JAZZ_SCSI_IRQ, esp_intr,
SA_INTERRUPT
, "JAZZ SCSI",
+ request_irq(JAZZ_SCSI_IRQ, esp_intr,
IRQF_DISABLED
, "JAZZ SCSI",
esp->ehost);
/*
esp->ehost);
/*
@@
-258,7
+257,7
@@
static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, struct scsi_cmnd *sp)
static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, struct scsi_cmnd *sp)
{
int sz = sp->use_sg - 1;
static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, struct 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) {
vdma_free(sg[sz].dma_address);
while(sz >= 0) {
vdma_free(sg[sz].dma_address);