diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-24 18:05:09 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-10-28 21:10:16 -0500 |
| commit | 422c0d61d591cbfb70f029e13505fb437e169d68 (patch) | |
| tree | ebafa14e1c1564ddf263868c3b6907642a8fdf1e /drivers/scsi/fd_mcs.c | |
| parent | 017560fca496f72ed9dd734ffde63ce39dfe0411 (diff) | |
| download | op-kernel-dev-422c0d61d591cbfb70f029e13505fb437e169d68.zip op-kernel-dev-422c0d61d591cbfb70f029e13505fb437e169d68.tar.gz | |
[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/fd_mcs.c')
| -rw-r--r-- | drivers/scsi/fd_mcs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/fd_mcs.c b/drivers/scsi/fd_mcs.c index d59d449..6d44602 100644 --- a/drivers/scsi/fd_mcs.c +++ b/drivers/scsi/fd_mcs.c @@ -671,7 +671,7 @@ static irqreturn_t fd_mcs_intr(int irq, void *dev_id, struct pt_regs *regs) outb(0x40 | FIFO_COUNT, Interrupt_Cntl_port); outb(0x82, SCSI_Cntl_port); /* Bus Enable + Select */ - outb(adapter_mask | (1 << current_SC->device->id), SCSI_Data_NoACK_port); + outb(adapter_mask | (1 << scmd_id(current_SC)), SCSI_Data_NoACK_port); /* Stop arbitration and enable parity */ outb(0x10 | PARITY_MASK, TMC_Cntl_port); @@ -683,7 +683,7 @@ static irqreturn_t fd_mcs_intr(int irq, void *dev_id, struct pt_regs *regs) status = inb(SCSI_Status_port); if (!(status & 0x01)) { /* Try again, for slow devices */ - if (fd_mcs_select(shpnt, current_SC->device->id)) { + if (fd_mcs_select(shpnt, scmd_id(current_SC))) { #if EVERY_ACCESS printk(" SFAIL "); #endif |
