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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
scsi
/
sun3_scsi.c
diff --git
a/drivers/scsi/sun3_scsi.c
b/drivers/scsi/sun3_scsi.c
index
8371734
..
69ee3e4
100644
(file)
--- a/
drivers/scsi/sun3_scsi.c
+++ b/
drivers/scsi/sun3_scsi.c
@@
-75,9
+75,9
@@
#define REAL_DMA
#include "scsi.h"
#define REAL_DMA
#include "scsi.h"
+#include "initio.h"
#include <scsi/scsi_host.h>
#include "sun3_scsi.h"
#include <scsi/scsi_host.h>
#include "sun3_scsi.h"
-#include "NCR5380.h"
static void NCR5380_print(struct Scsi_Host *instance);
static void NCR5380_print(struct Scsi_Host *instance);
@@
-102,7
+102,7
@@
static void NCR5380_print(struct Scsi_Host *instance);
#define ENABLE_IRQ() enable_irq( IRQ_SUN3_SCSI );
#define ENABLE_IRQ() enable_irq( IRQ_SUN3_SCSI );
-static irqreturn_t scsi_sun3_intr(int irq, void *dummy
, struct pt_regs *fp
);
+static irqreturn_t scsi_sun3_intr(int irq, void *dummy);
static inline unsigned char sun3scsi_read(int reg);
static inline void sun3scsi_write(int reg, int value);
static inline unsigned char sun3scsi_read(int reg);
static inline void sun3scsi_write(int reg, int value);
@@
-119,7
+119,7
@@
module_param(setup_use_tagged_queuing, int, 0);
static int setup_hostid = -1;
module_param(setup_hostid, int, 0);
static int setup_hostid = -1;
module_param(setup_hostid, int, 0);
-static
Scsi_C
mnd *sun3_dma_setup_done = NULL;
+static
struct scsi_c
mnd *sun3_dma_setup_done = NULL;
#define AFTER_RESET_DELAY (HZ/2)
#define AFTER_RESET_DELAY (HZ/2)
@@
-371,7
+371,7
@@
const char * sun3scsi_info (struct Scsi_Host *spnt) {
// safe bits for the CSR
#define CSR_GOOD 0x060f
// safe bits for the CSR
#define CSR_GOOD 0x060f
-static irqreturn_t scsi_sun3_intr(int irq, void *dummy
, struct pt_regs *fp
)
+static irqreturn_t scsi_sun3_intr(int irq, void *dummy)
{
unsigned short csr = dregs->csr;
int handled = 0;
{
unsigned short csr = dregs->csr;
int handled = 0;
@@
-388,7
+388,7
@@
static irqreturn_t scsi_sun3_intr(int irq, void *dummy, struct pt_regs *fp)
}
if(csr & (CSR_SDB_INT | CSR_DMA_INT)) {
}
if(csr & (CSR_SDB_INT | CSR_DMA_INT)) {
- NCR5380_intr(irq, dummy
, fp
);
+ NCR5380_intr(irq, dummy);
handled = 1;
}
handled = 1;
}
@@
-521,10
+521,11
@@
static inline unsigned long sun3scsi_dma_residual(struct Scsi_Host *instance)
return last_residual;
}
return last_residual;
}
-static inline unsigned long sun3scsi_dma_xfer_len(unsigned long wanted, Scsi_Cmnd *cmd,
- int write_flag)
+static inline unsigned long sun3scsi_dma_xfer_len(unsigned long wanted,
+ struct scsi_cmnd *cmd,
+ int write_flag)
{
{
- if(
cmd->request->flags & REQ_CMD
)
+ if(
blk_fs_request(cmd->request)
)
return wanted;
else
return 0;
return wanted;
else
return 0;