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
/
mac_esp.c
diff --git
a/drivers/scsi/mac_esp.c
b/drivers/scsi/mac_esp.c
index
0a42323
..
3586fac
100644
(file)
--- a/
drivers/scsi/mac_esp.c
+++ b/
drivers/scsi/mac_esp.c
@@
-26,7
+26,7
@@
#include <linux/interrupt.h>
#include "scsi.h"
#include <linux/interrupt.h>
#include "scsi.h"
-#include
"hosts.h"
+#include
<scsi/scsi_host.h>
#include "NCR53C9x.h"
#include <asm/io.h>
#include "NCR53C9x.h"
#include <asm/io.h>
@@
-43,11
+43,8
@@
/* #define DEBUG_MAC_ESP */
/* #define DEBUG_MAC_ESP */
-#define mac_turnon_irq(x) mac_enable_irq(x)
-#define mac_turnoff_irq(x) mac_disable_irq(x)
-
extern void esp_handle(struct NCR_ESP *esp);
extern void esp_handle(struct NCR_ESP *esp);
-extern void mac_esp_intr(int irq, void *dev_id
, struct pt_regs *pregs
);
+extern void mac_esp_intr(int irq, void *dev_id);
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 int dma_bytes_sent(struct NCR_ESP * esp, int fifo_count);
static int dma_can_transfer(struct NCR_ESP * esp, Scsi_Cmnd *sp);
@@
-91,7
+88,7
@@
static int setup_hostid = -1;
* set up properly!
*/
* set up properly!
*/
-void mac_esp_intr(int irq, void *dev_id
, struct pt_regs *pregs
)
+void mac_esp_intr(int irq, void *dev_id)
{
struct NCR_ESP *esp = (struct NCR_ESP *) dev_id;
int irq_p = 0;
{
struct NCR_ESP *esp = (struct NCR_ESP *) dev_id;
int irq_p = 0;
@@
-125,24
+122,24
@@
void mac_esp_intr(int irq, void *dev_id, struct pt_regs *pregs)
* acknowledge on the various machines
*/
* acknowledge on the various machines
*/
-void scsi_esp_polled(int irq, void *dev_id
, struct pt_regs *pregs
)
+void scsi_esp_polled(int irq, void *dev_id)
{
if (esp_initialized == 0)
return;
{
if (esp_initialized == 0)
return;
- mac_esp_intr(irq, dev_id
, pregs
);
+ mac_esp_intr(irq, dev_id);
}
}
-void fake_intr(int irq, void *dev_id
, struct pt_regs *pregs
)
+void fake_intr(int irq, void *dev_id)
{
#ifdef DEBUG_MAC_ESP
printk("mac_esp: got irq\n");
#endif
{
#ifdef DEBUG_MAC_ESP
printk("mac_esp: got irq\n");
#endif
- mac_esp_intr(irq, dev_id
, pregs
);
+ mac_esp_intr(irq, dev_id);
}
}
-irqreturn_t fake_drq(int irq, void *dev_id
, struct pt_regs *pregs
)
+irqreturn_t fake_drq(int irq, void *dev_id)
{
printk("mac_esp: got drq\n");
return IRQ_HANDLED;
{
printk("mac_esp: got drq\n");
return IRQ_HANDLED;
@@
-300,7
+297,7
@@
unsigned long get_base(int chip_num)
* Model dependent ESP setup
*/
* Model dependent ESP setup
*/
-int mac_esp_detect(
Scsi_Host_T
emplate * tpnt)
+int mac_esp_detect(
struct scsi_host_t
emplate * tpnt)
{
int quick = 0;
int chipnum, chipspresent = 0;
{
int quick = 0;
int chipnum, chipspresent = 0;
@@
-639,13
+636,13
@@
static void dma_init_write(struct NCR_ESP * esp, char * vaddress, int length)
static void dma_ints_off(struct NCR_ESP * esp)
{
static void dma_ints_off(struct NCR_ESP * esp)
{
-
mac_turnoff
_irq(esp->irq);
+
disable
_irq(esp->irq);
}
static void dma_ints_on(struct NCR_ESP * esp)
{
}
static void dma_ints_on(struct NCR_ESP * esp)
{
-
mac_turnon
_irq(esp->irq);
+
enable
_irq(esp->irq);
}
/*
}
/*
@@
-730,8
+727,8
@@
static void dma_setup_quick(struct NCR_ESP * esp, __u32 addr, int count, int wri
#endif
}
#endif
}
-static
Scsi_Host_T
emplate driver_template = {
- .proc_name = "esp",
+static
struct scsi_host_t
emplate driver_template = {
+ .proc_name = "
mac_
esp",
.name = "Mac 53C9x SCSI",
.detect = mac_esp_detect,
.slave_alloc = esp_slave_alloc,
.name = "Mac 53C9x SCSI",
.detect = mac_esp_detect,
.slave_alloc = esp_slave_alloc,