scsi: aic79xx: Make BUILD_SCSIID() a function

Convert BUILD_SCSIID() into a function and add a scsi_device argument.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20231002154328.43718-9-hare@suse.de
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index f2f3405cdec5e9a69f0e3f943d2482fbca382572..7e5253da04cd0fc35333f0b84f6d4f1ff7563724 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -541,8 +541,11 @@ ahd_linux_unmap_scb(struct ahd_softc *ahd, struct scb *scb)
 }
 
 /******************************** Macros **************************************/
-#define BUILD_SCSIID(ahd, cmd)                                         \
-       (((scmd_id(cmd) << TID_SHIFT) & TID) | (ahd)->our_id)
+static inline unsigned int ahd_build_scsiid(struct ahd_softc *ahd,
+                                           struct scsi_device *sdev)
+{
+       return ((sdev_id(sdev) << TID_SHIFT) & TID) | (ahd)->our_id;
+}
 
 /*
  * Return a string describing the driver.
@@ -818,7 +821,7 @@ ahd_linux_dev_reset(struct scsi_cmnd *cmd)
        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 = ahd_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;
@@ -1577,7 +1580,7 @@ ahd_linux_run_command(struct ahd_softc *ahd, struct ahd_linux_device *dev,
         * Fill out basics of the HSCB.
         */
        hscb->control = 0;
-       hscb->scsiid = BUILD_SCSIID(ahd, cmd);
+       hscb->scsiid = ahd_build_scsiid(ahd, cmd->device);
        hscb->lun = cmd->device->lun;
        scb->hscb->task_management = 0;
        mask = SCB_GET_TARGET_MASK(ahd, scb);