diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-24 18:05:09 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-10-28 22:10:16 -0400 |
commit | 422c0d61d591cbfb70f029e13505fb437e169d68 (patch) | |
tree | ebafa14e1c1564ddf263868c3b6907642a8fdf1e /drivers/scsi/imm.c | |
parent | 017560fca496f72ed9dd734ffde63ce39dfe0411 (diff) |
[SCSI] use scmd_id(), scmd_channel() throughout code
Wrap a highly common idiom. Makes the code easier to read, helps pave
the way for sdev->{id,channel} removal, and adds a token that can easily
by grepped-for in the future.
There are a couple sdev_id() and scmd_printk() updates thrown in as well.
Rejections fixed up and
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/imm.c')
-rw-r--r-- | drivers/scsi/imm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c index 65e845665b85..fc0f30ae0f77 100644 --- a/drivers/scsi/imm.c +++ b/drivers/scsi/imm.c | |||
@@ -830,7 +830,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd) | |||
830 | 830 | ||
831 | /* Phase 2 - We are now talking to the scsi bus */ | 831 | /* Phase 2 - We are now talking to the scsi bus */ |
832 | case 2: | 832 | case 2: |
833 | if (!imm_select(dev, cmd->device->id)) { | 833 | if (!imm_select(dev, scmd_id(cmd))) { |
834 | imm_fail(dev, DID_NO_CONNECT); | 834 | imm_fail(dev, DID_NO_CONNECT); |
835 | return 0; | 835 | return 0; |
836 | } | 836 | } |