From: Hannes Reinecke <hare@suse.de>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>,
James Bottomley <james.bottomley@hansenpartnership.com>,
linux-scsi@vger.kernel.org, Hannes Reinecke <hare@suse.de>,
Johannes Thumshirn <johannes.thumshirn@wdc.com>
Subject: [PATCH 13/20] aic79xx: make BUILD_SCSIID() a function
Date: Thu, 12 May 2022 13:12:29 +0200 [thread overview]
Message-ID: <20220512111236.109851-14-hare@suse.de> (raw)
In-Reply-To: <20220512111236.109851-1-hare@suse.de>
Convert BUILD_SCSIID() into a function and add a scsi_device argument.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
drivers/scsi/aic7xxx/aic79xx_osm.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 928099163f0f..8172ec43736c 100644
--- 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);
--
2.29.2
next prev parent reply other threads:[~2022-05-12 11:13 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-12 11:12 [PATCHv3 00/20] scsi: EH rework prep patches, part 1 Hannes Reinecke
2022-05-12 11:12 ` [PATCH 01/20] csiostor: use fc_block_rport() Hannes Reinecke
2022-05-12 11:12 ` [PATCH 02/20] fc_fcp: " Hannes Reinecke
2022-05-12 11:12 ` [PATCH 03/20] mptfc: simplify mpt_fc_block_error_handler() Hannes Reinecke
2022-05-12 11:12 ` [PATCH 04/20] mptfusion: correct definitions for mptscsih_dev_reset() Hannes Reinecke
2022-05-19 17:27 ` Ewan Milne
2022-05-23 12:25 ` Hannes Reinecke
2022-05-12 11:12 ` [PATCH 05/20] mptfc: open-code mptfc_block_error_handler() for bus reset Hannes Reinecke
2022-05-19 17:05 ` Ewan Milne
2022-05-20 6:42 ` Hannes Reinecke
2022-05-12 11:12 ` [PATCH 06/20] qedf: use fc rport as argument for qedf_initiate_tmf() Hannes Reinecke
2022-05-19 18:22 ` Ewan Milne
2022-05-20 6:49 ` Hannes Reinecke
2022-05-25 19:06 ` Ewan Milne
2022-05-27 5:39 ` Hannes Reinecke
2022-05-12 11:12 ` [PATCH 07/20] bnx2fc: Do not rely on a scsi command for lun or target reset Hannes Reinecke
2022-05-12 11:12 ` [PATCH 08/20] ibmvfc: open-code reset loop for " Hannes Reinecke
2022-05-19 20:05 ` Ewan Milne
2022-05-20 5:52 ` Hannes Reinecke
2022-05-12 11:12 ` [PATCH 09/20] ibmvfc: use fc_block_rport() Hannes Reinecke
2022-05-12 11:12 ` [PATCH 10/20] fnic: use dedicated device reset command Hannes Reinecke
2022-05-12 11:12 ` [PATCH 11/20] fnic: use fc_block_rport() correctly Hannes Reinecke
2022-05-12 11:12 ` [PATCH 12/20] aic7xxx: make BUILD_SCSIID() a function Hannes Reinecke
2022-05-16 5:49 ` Christoph Hellwig
2022-05-12 11:12 ` Hannes Reinecke [this message]
2022-05-16 5:49 ` [PATCH 13/20] aic79xx: " Christoph Hellwig
2022-05-12 11:12 ` [PATCH 14/20] aic7xxx: do not reference scsi command when resetting device Hannes Reinecke
2022-05-12 11:12 ` [PATCH 15/20] aic79xx: " Hannes Reinecke
2022-05-12 11:12 ` [PATCH 16/20] snic: reserve tag for TMF Hannes Reinecke
2022-05-13 8:03 ` John Garry
2022-05-12 11:12 ` [PATCH 17/20] snic: use dedicated device reset command Hannes Reinecke
2022-05-12 11:12 ` [PATCH 18/20] snic: Use scsi_host_busy_iter() to traverse commands Hannes Reinecke
2022-05-12 11:12 ` [PATCH 19/20] ips: Do not try to abort command from host reset Hannes Reinecke
2022-05-12 11:12 ` [PATCH 20/20] megaraid: pass in NULL scb for " Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220512111236.109851-14-hare@suse.de \
--to=hare@suse.de \
--cc=hch@lst.de \
--cc=james.bottomley@hansenpartnership.com \
--cc=johannes.thumshirn@wdc.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.