Commit 9cc9ef28 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: aic79xx: Make BUILD_SCSIID() a function 



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

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20231002154328.43718-9-hare@suse.de


Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 10f5aa01

drivers/scsi/aic7xxx/aic79xx_osm.c

+7 −4
Original line number Diff line number Diff line
@@ -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);