svn commit: r345964 - head/sys/dev/smartpqi

[Konstantin Belousov]

Author: kib
Date: Fri Apr  5 19:27:51 2019
New Revision: 345964
URL: https://svnweb.freebsd.org/changeset/base/345964

Log:
  Remove single-use DEV_RESET() macro.
  
  It conflicts with the sys/bus.h DEV_XXX namespace.
  
  Reviewed by:	imp (previous version), jhb (previous version)
  Sponsored by:	Mellanox Technologies
  MFC after:	2 weeks
  Differential revision:	https://reviews.freebsd.org/D19646

Modified:
  head/sys/dev/smartpqi/smartpqi_cam.c
  head/sys/dev/smartpqi/smartpqi_defines.h

Modified: head/sys/dev/smartpqi/smartpqi_cam.c
==============================================================================
--- head/sys/dev/smartpqi/smartpqi_cam.c	Fri Apr  5 19:25:26 2019	(r345963)
+++ head/sys/dev/smartpqi/smartpqi_cam.c	Fri Apr  5 19:27:51 2019	(r345964)
@@ -739,7 +739,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: head/sys/dev/smartpqi/smartpqi_defines.h
==============================================================================
--- head/sys/dev/smartpqi/smartpqi_defines.h	Fri Apr  5 19:25:26 2019	(r345963)
+++ head/sys/dev/smartpqi/smartpqi_defines.h	Fri Apr  5 19:27:51 2019	(r345964)
@@ -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