projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[TG3]: Update version and reldate
[powerpc.git]
/
drivers
/
scsi
/
NCR5380.c
diff --git
a/drivers/scsi/NCR5380.c
b/drivers/scsi/NCR5380.c
index
cba9655
..
75f2f7a
100644
(file)
--- a/
drivers/scsi/NCR5380.c
+++ b/
drivers/scsi/NCR5380.c
@@
-87,6
+87,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>
#ifndef NDEBUG
#define NDEBUG 0
#ifndef NDEBUG
#define NDEBUG 0
@@
-295,7
+296,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 = page_address(cmd->SCp.buffer->page)+
cmd->SCp.buffer->offset;
cmd->SCp.buffers_residual = cmd->use_sg - 1;
cmd->SCp.ptr = page_address(cmd->SCp.buffer->page)+
cmd->SCp.buffer->offset;
@@
-499,7
+500,7
@@
static void NCR5380_print_phase(struct Scsi_Host *instance)
/*
* Function : int should_disconnect (unsigned char cmd)
*
/*
* Function : int should_disconnect (unsigned char cmd)
*
- * Purpose : decide w
ea
ther a command would normally disconnect or
+ * Purpose : decide w
he
ther a command would normally disconnect or
* not, since if it won't disconnect we should go to sleep.
*
* Input : cmd - opcode of SCSI command
* not, since if it won't disconnect we should go to sleep.
*
* Input : cmd - opcode of SCSI command
@@
-2377,7
+2378,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 */
@@
-2424,7
+2425,7
@@
static void NCR5380_information_transfer(struct Scsi_Host *instance) {
default:
if (!tmp) {
printk("scsi%d: rejecting message ", instance->host_no);
default:
if (!tmp) {
printk("scsi%d: rejecting message ", instance->host_no);
- s
cs
i_print_msg(extended_msg);
+ s
p
i_print_msg(extended_msg);
printk("\n");
} else if (tmp != EXTENDED_MESSAGE)
scmd_printk(KERN_INFO, cmd,
printk("\n");
} else if (tmp != EXTENDED_MESSAGE)
scmd_printk(KERN_INFO, cmd,
@@
-2560,7
+2561,7
@@
static void NCR5380_reselect(struct Scsi_Host *instance) {
if (!(msg[0] & 0x80)) {
printk(KERN_ERR "scsi%d : expecting IDENTIFY message, got ", instance->host_no);
if (!(msg[0] & 0x80)) {
printk(KERN_ERR "scsi%d : expecting IDENTIFY message, got ", instance->host_no);
- s
cs
i_print_msg(msg);
+ s
p
i_print_msg(msg);
abort = 1;
} else {
/* Accept message by clearing ACK */
abort = 1;
} else {
/* Accept message by clearing ACK */