projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'powerpc-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...
[cascardo/linux.git]
/
drivers
/
scsi
/
NCR5380.c
diff --git
a/drivers/scsi/NCR5380.c
b/drivers/scsi/NCR5380.c
index
43908bb
..
db27390
100644
(file)
--- a/
drivers/scsi/NCR5380.c
+++ b/
drivers/scsi/NCR5380.c
@@
-230,13
+230,6
@@
static int NCR5380_poll_politely2(struct Scsi_Host *instance,
return -ETIMEDOUT;
}
return -ETIMEDOUT;
}
-static inline int NCR5380_poll_politely(struct Scsi_Host *instance,
- int reg, int bit, int val, int wait)
-{
- return NCR5380_poll_politely2(instance, reg, bit, val,
- reg, bit, val, wait);
-}
-
#if NDEBUG
static struct {
unsigned char mask;
#if NDEBUG
static struct {
unsigned char mask;
@@
-1854,11
+1847,11
@@
static void NCR5380_information_transfer(struct Scsi_Host *instance)
/* XXX - need to source or sink data here, as appropriate */
}
} else {
/* XXX - need to source or sink data here, as appropriate */
}
} else {
- /*
Break up transfer into 3 ms chunks,
- *
presuming 6 accesses per handshake
.
+ /*
Transfer a small chunk so that the
+ *
irq mode lock is not held too long
.
*/
*/
- transfersize = min(
(unsigned long)
cmd->SCp.this_residual,
-
hostdata->accesses_per_ms / 2
);
+ transfersize = min(cmd->SCp.this_residual,
+
NCR5380_PIO_CHUNK_SIZE
);
len = transfersize;
NCR5380_transfer_pio(instance, &phase, &len,
(unsigned char **)&cmd->SCp.ptr);
len = transfersize;
NCR5380_transfer_pio(instance, &phase, &len,
(unsigned char **)&cmd->SCp.ptr);