projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sound-5.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
[linux-2.6-microblaze.git]
/
drivers
/
scsi
/
qlogicfas408.c
diff --git
a/drivers/scsi/qlogicfas408.c
b/drivers/scsi/qlogicfas408.c
index
3bbe0b5
..
30a8884
100644
(file)
--- a/
drivers/scsi/qlogicfas408.c
+++ b/
drivers/scsi/qlogicfas408.c
@@
-442,7
+442,7
@@
static void ql_ihandl(void *dev_id)
* If result is CHECK CONDITION done calls qcommand to request
* sense
*/
* If result is CHECK CONDITION done calls qcommand to request
* sense
*/
-
(icmd->scsi_done)
(icmd);
+
scsi_done
(icmd);
}
irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id)
}
irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id)
@@
-460,9
+460,9
@@
irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id)
* Queued command
*/
* Queued command
*/
-static int qlogicfas408_queuecommand_lck(struct scsi_cmnd *cmd,
- void (*done) (struct scsi_cmnd *))
+static int qlogicfas408_queuecommand_lck(struct scsi_cmnd *cmd)
{
{
+ void (*done)(struct scsi_cmnd *) = scsi_done;
struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
set_host_byte(cmd, DID_OK);
struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
set_host_byte(cmd, DID_OK);
@@
-473,7
+473,6
@@
static int qlogicfas408_queuecommand_lck(struct scsi_cmnd *cmd,
return 0;
}
return 0;
}
- cmd->scsi_done = done;
/* wait for the last command's interrupt to finish */
while (priv->qlcmd != NULL) {
barrier();
/* wait for the last command's interrupt to finish */
while (priv->qlcmd != NULL) {
barrier();