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
/
atari_NCR5380.c
diff --git
a/drivers/scsi/atari_NCR5380.c
b/drivers/scsi/atari_NCR5380.c
index
2c12be7
..
0f920c8
100644
(file)
--- a/
drivers/scsi/atari_NCR5380.c
+++ b/
drivers/scsi/atari_NCR5380.c
@@
-74,6
+74,7
@@
* the high level code.
*/
#include <scsi/scsi_dbg.h>
* the high level code.
*/
#include <scsi/scsi_dbg.h>
+#include <scsi/scsi_transport_spi.h>
#if (NDEBUG & NDEBUG_LISTS)
#define LIST(x,y) \
#if (NDEBUG & NDEBUG_LISTS)
#define LIST(x,y) \
@@
-255,7
+256,7
@@
*/
static struct Scsi_Host *first_instance = NULL;
*/
static struct Scsi_Host *first_instance = NULL;
-static
Scsi_Host_T
emplate *the_template = NULL;
+static
struct scsi_host_t
emplate *the_template = NULL;
/* Macros ease life... :-) */
#define SETUP_HOSTDATA(in) \
/* Macros ease life... :-) */
#define SETUP_HOSTDATA(in) \
@@
-506,7
+507,7
@@
static __inline__ void initialize_SCp(Scsi_Cmnd *cmd)
*/
if (cmd->use_sg) {
*/
if (cmd->use_sg) {
- cmd->SCp.buffer = (struct scatterlist *) cmd->buffer;
+ cmd->SCp.buffer = (struct scatterlist *) cmd->
request_
buffer;
cmd->SCp.buffers_residual = cmd->use_sg - 1;
cmd->SCp.ptr = (char *)page_address(cmd->SCp.buffer->page)+
cmd->SCp.buffer->offset;
cmd->SCp.buffers_residual = cmd->use_sg - 1;
cmd->SCp.ptr = (char *)page_address(cmd->SCp.buffer->page)+
cmd->SCp.buffer->offset;
@@
-523,7
+524,6
@@
static __inline__ void initialize_SCp(Scsi_Cmnd *cmd)
}
}
}
}
-#include <linux/config.h>
#include <linux/delay.h>
#if NDEBUG
#include <linux/delay.h>
#if NDEBUG
@@
-1262,7
+1262,7
@@
static void NCR5380_dma_complete( struct Scsi_Host *instance )
*
*/
*
*/
-static irqreturn_t NCR5380_intr (int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t NCR5380_intr (int irq, void *dev_id)
{
struct Scsi_Host *instance = first_instance;
int done = 1, handled = 0;
{
struct Scsi_Host *instance = first_instance;
int done = 1, handled = 0;
@@
-2355,7
+2355,7
@@
static void NCR5380_information_transfer (struct Scsi_Host *instance)
* 3..length+1 arguments
*
* Start the extended message buffer with the EXTENDED_MESSAGE
* 3..length+1 arguments
*
* Start the extended message buffer with the EXTENDED_MESSAGE
- * byte, since s
cs
i_print_msg() wants the whole thing.
+ * byte, since s
p
i_print_msg() wants the whole thing.
*/
extended_msg[0] = EXTENDED_MESSAGE;
/* Accept first byte by clearing ACK */
*/
extended_msg[0] = EXTENDED_MESSAGE;
/* Accept first byte by clearing ACK */
@@
-2408,7
+2408,7
@@
static void NCR5380_information_transfer (struct Scsi_Host *instance)
default:
if (!tmp) {
printk(KERN_DEBUG "scsi%d: rejecting message ", HOSTNO);
default:
if (!tmp) {
printk(KERN_DEBUG "scsi%d: rejecting message ", HOSTNO);
- s
csi_print_msg
(extended_msg);
+ s
pi_print_msg
(extended_msg);
printk("\n");
} else if (tmp != EXTENDED_MESSAGE)
printk(KERN_DEBUG "scsi%d: rejecting unknown "
printk("\n");
} else if (tmp != EXTENDED_MESSAGE)
printk(KERN_DEBUG "scsi%d: rejecting unknown "
@@
-2541,7
+2541,7
@@
static void NCR5380_reselect (struct Scsi_Host *instance)
if (!(msg[0] & 0x80)) {
printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO);
if (!(msg[0] & 0x80)) {
printk(KERN_DEBUG "scsi%d: expecting IDENTIFY message, got ", HOSTNO);
- s
cs
i_print_msg(msg);
+ s
p
i_print_msg(msg);
do_abort(instance);
return;
}
do_abort(instance);
return;
}