On Tue, Mar 01, 2022 at 03:39:54PM +0100, Hannes Reinecke wrote:
> Signed-off-by: Hannes Reinecke <hare@xxxxxxxx>
> ---
> drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
> index d3b1082654d5..16d7a7310e90 100644
> --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
> +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
> @@ -799,10 +799,10 @@ 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))
> +#define BUILD_SCSIID(ahc, sdev) \
> + ((((sdev)->id << TID_SHIFT) & TID) \
> + | (((sdev)->channel == 0) ? (ahc)->our_id : (ahc)->our_id_b) \
> + | (((sdev)->channel == 0) ? 0 : TWIN_CHNLB))
How about converting this to a function while you're at it?
Otherwise this looks good.
Same comment for aic79xx.
