projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
[cascardo/linux.git]
/
drivers
/
scsi
/
oktagon_esp.c
diff --git
a/drivers/scsi/oktagon_esp.c
b/drivers/scsi/oktagon_esp.c
index
d7a0bcc
..
26a6d55
100644
(file)
--- a/
drivers/scsi/oktagon_esp.c
+++ b/
drivers/scsi/oktagon_esp.c
@@
-72,12
+72,12
@@
static void dma_advance_sg(Scsi_Cmnd *);
static int oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x);
#ifdef USE_BOTTOM_HALF
static int oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x);
#ifdef USE_BOTTOM_HALF
-static void dma_commit(
void *opaque
);
+static void dma_commit(
struct work_struct *unused
);
long oktag_to_io(long *paddr, long *addr, long len);
long oktag_from_io(long *addr, long *paddr, long len);
long oktag_to_io(long *paddr, long *addr, long len);
long oktag_from_io(long *addr, long *paddr, long len);
-static DECLARE_WORK(tq_fake_dma, dma_commit
, NULL
);
+static DECLARE_WORK(tq_fake_dma, dma_commit);
#define DMA_MAXTRANSFER 0x8000
#define DMA_MAXTRANSFER 0x8000
@@
-133,7
+133,7
@@
int oktagon_esp_detect(struct scsi_host_template *tpnt)
eregs = (struct ESP_regs *)(address + OKTAGON_ESP_ADDR);
/* This line was 5 lines lower */
eregs = (struct ESP_regs *)(address + OKTAGON_ESP_ADDR);
/* This line was 5 lines lower */
- esp = esp_allocate(tpnt, (void *)board
+OKTAGON_ESP_ADDR
);
+ esp = esp_allocate(tpnt, (void *)board
+ OKTAGON_ESP_ADDR, 0
);
/* we have to shift the registers only one bit for oktagon */
esp->shift = 1;
/* we have to shift the registers only one bit for oktagon */
esp->shift = 1;
@@
-197,7
+197,7
@@
int oktagon_esp_detect(struct scsi_host_template *tpnt)
esp->esp_command_dvma = (__u32) cmd_buffer;
esp->irq = IRQ_AMIGA_PORTS;
esp->esp_command_dvma = (__u32) cmd_buffer;
esp->irq = IRQ_AMIGA_PORTS;
- request_irq(IRQ_AMIGA_PORTS, esp_intr,
SA_SHIRQ
,
+ request_irq(IRQ_AMIGA_PORTS, esp_intr,
IRQF_SHARED
,
"BSC Oktagon SCSI", esp->ehost);
/* Figure out our scsi ID on the bus */
"BSC Oktagon SCSI", esp->ehost);
/* Figure out our scsi ID on the bus */
@@
-266,7
+266,7
@@
oktagon_notify_reboot(struct notifier_block *this, unsigned long code, void *x)
*/
*/
-static void dma_commit(
void *opaque
)
+static void dma_commit(
struct work_struct *unused
)
{
long wait,len2,pos;
struct NCR_ESP *esp;
{
long wait,len2,pos;
struct NCR_ESP *esp;