Author: kib
Date: Fri Apr 19 12:38:48 2019
New Revision: 346375
URL: https://svnweb.freebsd.org/changeset/base/346375
Log:
MFC r345964:
Remove single-use DEV_RESET() macro.
Modified:
stable/12/sys/dev/smartpqi/smartpqi_cam.c
stable/12/sys/dev/smartpqi/smartpqi_defines.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/smartpqi/smartpqi_cam.c
==============================================================================
--- stable/12/sys/dev/smartpqi/smartpqi_cam.c Fri Apr 19 12:33:58 2019
(r346374)
+++ stable/12/sys/dev/smartpqi/smartpqi_cam.c Fri Apr 19 12:38:48 2019
(r346375)
@@ -725,7 +725,7 @@ static int pqisrc_io_start(struct cam_sim *sim, union
return error;
}
/* Check device reset */
- if (DEV_RESET(dvp)) {
+ if (dvp->reset_in_progress) {
ccb->ccb_h.status = CAM_SCSI_BUSY | CAM_REQ_INPROG | CAM_BUSY;
DBG_WARN("Device %d reset returned busy\n",
ccb->ccb_h.target_id);
return error;
Modified: stable/12/sys/dev/smartpqi/smartpqi_defines.h
==============================================================================
--- stable/12/sys/dev/smartpqi/smartpqi_defines.h Fri Apr 19 12:33:58
2019 (r346374)
+++ stable/12/sys/dev/smartpqi/smartpqi_defines.h Fri Apr 19 12:38:48
2019 (r346375)
@@ -386,8 +386,6 @@ enum pqisrc_ctrl_mode{
#define IS_AIO_PATH(dev) (dev->aio_enabled)
#define IS_RAID_PATH(dev) (!dev->aio_enabled)
-#define DEV_RESET(dvp) (dvp->reset_in_progress)
-
/* SOP data direction flags */
#define SOP_DATA_DIR_NONE 0x00
#define SOP_DATA_DIR_FROM_DEVICE 0x01
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
