projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/fbdev into drm-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
scsi
/
atari_scsi.c
diff --git
a/drivers/scsi/atari_scsi.c
b/drivers/scsi/atari_scsi.c
index b690106046999e225392efda7cd06f7e93fe0783..d1c37a386947b03d080524dac5f18c244580bd08 100644
(file)
--- a/
drivers/scsi/atari_scsi.c
+++ b/
drivers/scsi/atari_scsi.c
@@
-110,7
+110,7
@@
#define NCR5380_dma_xfer_len(instance, cmd, phase) \
atari_dma_xfer_len(cmd->SCp.this_residual, cmd, !((phase) & SR_IO))
#define NCR5380_dma_xfer_len(instance, cmd, phase) \
atari_dma_xfer_len(cmd->SCp.this_residual, cmd, !((phase) & SR_IO))
-#define NCR5380_acquire_dma_irq(instance) falcon_get_lock()
+#define NCR5380_acquire_dma_irq(instance) falcon_get_lock(
instance
)
#define NCR5380_release_dma_irq(instance) falcon_release_lock()
#include "NCR5380.h"
#define NCR5380_release_dma_irq(instance) falcon_release_lock()
#include "NCR5380.h"
@@
-468,15
+468,15
@@
static void falcon_release_lock(void)
* command immediately but tell the SCSI mid-layer to defer.
*/
* command immediately but tell the SCSI mid-layer to defer.
*/
-static int falcon_get_lock(
void
)
+static int falcon_get_lock(
struct Scsi_Host *instance
)
{
if (IS_A_TT())
return 1;
if (in_interrupt())
{
if (IS_A_TT())
return 1;
if (in_interrupt())
- return stdma_try_lock(scsi_falcon_intr,
NULL
);
+ return stdma_try_lock(scsi_falcon_intr,
instance
);
- stdma_lock(scsi_falcon_intr,
NULL
);
+ stdma_lock(scsi_falcon_intr,
instance
);
return 1;
}
return 1;
}