Commit 958230bc authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: aic7xxx: Make BUILD_SCSIID() a function 



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

Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20231002154328.43718-7-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 6a137a96

drivers/scsi/aic7xxx/aic7xxx_osm.c

+13 −6
Original line number Diff line number Diff line
@@ -798,11 +798,18 @@ struct scsi_host_template aic7xxx_driver_template = { 


/**************************** Tasklet Handler *********************************/



/******************************** Macros **************************************/

#define BUILD_SCSIID(ahc, cmd)						    \

	((((cmd)->device->id << TID_SHIFT) & TID)			    \

	| (((cmd)->device->channel == 0) ? (ahc)->our_id : (ahc)->our_id_b) \

	| (((cmd)->device->channel == 0) ? 0 : TWIN_CHNLB))



static inline unsigned int ahc_build_scsiid(struct ahc_softc *ahc,

					    struct scsi_device *sdev)

{

	unsigned int scsiid = (sdev->id << TID_SHIFT) & TID;



	if (sdev->channel == 0)

		scsiid |= ahc->our_id;

	else

		scsiid |= ahc->our_id_b | TWIN_CHNLB;

	return scsiid;

}



/******************************** Bus DMA *************************************/

int
@@ -1457,7 +1464,7 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev, 
	 * Fill out basics of the HSCB.

	 */

	hscb->control = 0;

	hscb->scsiid = BUILD_SCSIID(ahc, cmd);

	hscb->scsiid = ahc_build_scsiid(ahc, cmd->device);

	hscb->lun = cmd->device->lun;

	mask = SCB_GET_TARGET_MASK(ahc, scb);

	tinfo = ahc_fetch_transinfo(ahc, SCB_GET_CHANNEL(ahc, scb),