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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
scsi
/
mca_53c9x.c
diff --git
a/drivers/scsi/mca_53c9x.c
b/drivers/scsi/mca_53c9x.c
index
f7b0d5c
..
194c754
100644
(file)
--- a/
drivers/scsi/mca_53c9x.c
+++ b/
drivers/scsi/mca_53c9x.c
@@
-43,7
+43,7
@@
#include <linux/mca-legacy.h>
#include "scsi.h"
#include <linux/mca-legacy.h>
#include "scsi.h"
-#include
"hosts.h"
+#include
<scsi/scsi_host.h>
#include "NCR53C9x.h"
#include <asm/dma.h>
#include "NCR53C9x.h"
#include <asm/dma.h>
@@
-103,7
+103,7
@@
static volatile unsigned char cmd_buffer[16];
static struct ESP_regs eregs;
/***************************************************************** Detection */
static struct ESP_regs eregs;
/***************************************************************** Detection */
-int mca_esp_detect(Scsi_Host_Template *tpnt)
+
static
int mca_esp_detect(Scsi_Host_Template *tpnt)
{
struct NCR_ESP *esp;
static int io_port_by_pos[] = MCA_53C9X_IO_PORTS;
{
struct NCR_ESP *esp;
static int io_port_by_pos[] = MCA_53C9X_IO_PORTS;
@@
-238,15
+238,15
@@
int mca_esp_detect(Scsi_Host_Template *tpnt)
/* Optional functions */
/* 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_barrier =
NULL
;
+ esp->dma_drain =
NULL
;
+ esp->dma_invalidate =
NULL
;
+ esp->dma_irq_entry =
NULL
;
+ esp->dma_irq_exit =
NULL
;
esp->dma_led_on = dma_led_on;
esp->dma_led_off = dma_led_off;
esp->dma_led_on = dma_led_on;
esp->dma_led_off = dma_led_off;
- esp->dma_poll =
0
;
- esp->dma_reset =
0
;
+ esp->dma_poll =
NULL
;
+ esp->dma_reset =
NULL
;
/* Set the command buffer */
/* Set the command buffer */
@@
-283,7
+283,7
@@
int mca_esp_detect(Scsi_Host_Template *tpnt)
/******************************************************************* Release */
/******************************************************************* Release */
-int mca_esp_release(struct Scsi_Host *host)
+
static
int mca_esp_release(struct Scsi_Host *host)
{
struct NCR_ESP *esp = (struct NCR_ESP *)host->hostdata;
unsigned char tmp_byte;
{
struct NCR_ESP *esp = (struct NCR_ESP *)host->hostdata;
unsigned char tmp_byte;
@@
-445,7
+445,7
@@
static void dma_led_off(struct NCR_ESP *esp)
}
static Scsi_Host_Template driver_template = {
}
static Scsi_Host_Template driver_template = {
- .proc_name = "
esp
",
+ .proc_name = "
mca_53c9x
",
.name = "NCR 53c9x SCSI",
.detect = mca_esp_detect,
.slave_alloc = esp_slave_alloc,
.name = "NCR 53c9x SCSI",
.detect = mca_esp_detect,
.slave_alloc = esp_slave_alloc,