projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SCSI] use scmd_id(), scmd_channel() throughout code
[deliverable/linux.git]
/
drivers
/
scsi
/
aic7xxx
/
aic7xxx_osm.c
diff --git
a/drivers/scsi/aic7xxx/aic7xxx_osm.c
b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 7074ab95d1ccc5aca73ac351695f47a2a7e73a41..1861407422e4a555fae273122e05c77b244054d0 100644
(file)
--- a/
drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/
drivers/scsi/aic7xxx/aic7xxx_osm.c
@@
-686,7
+686,7
@@
ahc_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev,
u_int channel;
ahc = *((struct ahc_softc **)sdev->host->hostdata);
u_int channel;
ahc = *((struct ahc_softc **)sdev->host->hostdata);
- channel = sdev
->channel
;
+ channel = sdev
_channel(sdev)
;
bh = scsi_bios_ptable(bdev);
if (bh) {
bh = scsi_bios_ptable(bdev);
if (bh) {
@@
-759,7
+759,7
@@
ahc_linux_bus_reset(struct scsi_cmnd *cmd)
ahc = *(struct ahc_softc **)cmd->device->host->hostdata;
ahc_lock(ahc, &flags);
ahc = *(struct ahc_softc **)cmd->device->host->hostdata;
ahc_lock(ahc, &flags);
- found = ahc_reset_channel(ahc,
cmd->device->channel
+ 'A',
+ found = ahc_reset_channel(ahc,
scmd_channel(cmd)
+ 'A',
/*initiate reset*/TRUE);
ahc_unlock(ahc, &flags);
/*initiate reset*/TRUE);
ahc_unlock(ahc, &flags);
@@
-2172,8
+2172,8
@@
ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
/* Any SCB for this device will do for a target reset */
LIST_FOREACH(pending_scb, &ahc->pending_scbs, pending_links) {
/* Any SCB for this device will do for a target reset */
LIST_FOREACH(pending_scb, &ahc->pending_scbs, pending_links) {
- if (ahc_match_scb(ahc, pending_scb,
cmd->device->id
,
-
cmd->device->channel
+ 'A',
+ if (ahc_match_scb(ahc, pending_scb,
scmd_id(cmd)
,
+
scmd_channel(cmd)
+ 'A',
CAM_LUN_WILDCARD,
SCB_LIST_NULL, ROLE_INITIATOR) == 0)
break;
CAM_LUN_WILDCARD,
SCB_LIST_NULL, ROLE_INITIATOR) == 0)
break;
@@
-2260,7
+2260,7
@@
ahc_linux_queue_recovery_cmd(struct scsi_cmnd *cmd, scb_flag flag)
if (last_phase != P_BUSFREE
&& (pending_scb->hscb->tag == active_scb_index
|| (flag == SCB_DEVICE_RESET
if (last_phase != P_BUSFREE
&& (pending_scb->hscb->tag == active_scb_index
|| (flag == SCB_DEVICE_RESET
- && SCSIID_TARGET(ahc, saved_scsiid) ==
cmd->device->id
))) {
+ && SCSIID_TARGET(ahc, saved_scsiid) ==
scmd_id(cmd)
))) {
/*
* We're active on the bus, so assert ATN
/*
* We're active on the bus, so assert ATN
This page took
0.030365 seconds
and
5
git commands to generate.