| Message ID | 20220301143957.40998-2-hare@suse.de (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | aic7xxx/aic79xx: fixes for SCSI EH rework | expand |
On Tue, Mar 01, 2022 at 03:39:54PM +0100, Hannes Reinecke wrote: > Signed-off-by: Hannes Reinecke <hare@suse.com> > --- > 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.
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)) /******************************** Bus DMA *************************************/ int @@ -1457,7 +1457,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 = 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),
Signed-off-by: Hannes Reinecke <hare@suse.com> --- drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)