d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove single-use DEV_RESET() macro.

Browse Source 
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
This commit is contained in:
Konstantin Belousov 2019-04-05 19:27:51 +00:00
parent 5db2a4a812
commit 7f755050f7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=345964
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/smartpqi/smartpqi_cam.c
View File

@ -739,7 +739,7 @@ static int pqisrc_io_start(struct cam_sim *sim, union ccb *ccb)
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;

2
sys/dev/smartpqi/smartpqi_defines.h
View File

@ -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