[PATCH 37/47] aic79xx: use scsi device as argument for BUILD_SCSIID()

[Hannes Reinecke]

Signed-off-by: Hannes Reinecke <h...@suse.com>
---
 drivers/scsi/aic7xxx/aic79xx_osm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c 
b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 0797c2f..66f9450 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -541,8 +541,8 @@ void ahd_insb(struct ahd_softc * ahd, long port,
 }
 
 /******************************** Macros 
**************************************/
-#define BUILD_SCSIID(ahd, cmd)                                         \
-       (((scmd_id(cmd) << TID_SHIFT) & TID) | (ahd)->our_id)
+#define BUILD_SCSIID(ahd, sdev)                                        \
+       (((sdev_id(sdev) << TID_SHIFT) & TID) | (ahd)->our_id)
 
 /*
  * Return a string describing the driver.
@@ -837,7 +837,7 @@ static DEF_SCSI_QCMD(ahd_linux_queue)
        ahd_set_sense_residual(reset_scb, 0);
        reset_scb->platform_data->xfer_len = 0;
        reset_scb->hscb->control = 0;
-       reset_scb->hscb->scsiid = BUILD_SCSIID(ahd,cmd);
+       reset_scb->hscb->scsiid = BUILD_SCSIID(ahd, cmd->device);
        reset_scb->hscb->lun = cmd->device->lun;
        reset_scb->hscb->cdb_len = 0;
        reset_scb->hscb->task_management = SIU_TASKMGMT_LUN_RESET;
@@ -1598,7 +1598,7 @@ struct scsi_host_template aic79xx_driver_template = {
         * Fill out basics of the HSCB.
         */
        hscb->control = 0;
-       hscb->scsiid = BUILD_SCSIID(ahd, cmd);
+       hscb->scsiid = BUILD_SCSIID(ahd, cmd->device);
        hscb->lun = cmd->device->lun;
        scb->hscb->task_management = 0;
        mask = SCB_GET_TARGET_MASK(ahd, scb);
-- 
1.8.5.6