diff options
author | Warner Losh <imp@FreeBSD.org> | 2017-12-06 00:29:50 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2017-12-06 00:29:50 +0000 |
commit | 553484ae07cc4980ac4451f7faa9ad8b88f34f71 (patch) | |
tree | 16849da1a7df109d89492fc1cb9f0592365ffd3d | |
parent | d2f3208ddaa199c957a5a42a0a2cb81e02cb97f1 (diff) | |
download | src-553484ae07cc4980ac4451f7faa9ad8b88f34f71.tar.gz src-553484ae07cc4980ac4451f7faa9ad8b88f34f71.zip |
Remove unused 4th argument to match the standard error routines.
Sponsored by: Netflix
Differential Revision: https://reviews.freebsd.org/D13386
Notes
Notes:
svn path=/head/; revision=326606
-rw-r--r-- | sys/cam/ata/ata_da.c | 2 | ||||
-rw-r--r-- | sys/cam/ata/ata_pmp.c | 2 | ||||
-rw-r--r-- | sys/cam/ata/ata_xpt.c | 4 | ||||
-rw-r--r-- | sys/cam/cam_periph.c | 4 | ||||
-rw-r--r-- | sys/cam/cam_periph.h | 2 | ||||
-rw-r--r-- | sys/cam/mmc/mmc_da.c | 2 | ||||
-rw-r--r-- | sys/cam/nvme/nvme_da.c | 6 | ||||
-rw-r--r-- | sys/cam/scsi/scsi_cd.c | 3 | ||||
-rw-r--r-- | sys/cam/scsi/scsi_ch.c | 3 | ||||
-rw-r--r-- | sys/cam/scsi/scsi_da.c | 7 | ||||
-rw-r--r-- | sys/cam/scsi/scsi_enc.c | 2 | ||||
-rw-r--r-- | sys/cam/scsi/scsi_pass.c | 3 | ||||
-rw-r--r-- | sys/cam/scsi/scsi_pt.c | 3 | ||||
-rw-r--r-- | sys/cam/scsi/scsi_sa.c | 4 | ||||
-rw-r--r-- | sys/cam/scsi/scsi_sg.c | 3 | ||||
-rw-r--r-- | sys/cam/scsi/scsi_xpt.c | 34 |
16 files changed, 36 insertions, 48 deletions
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index be79a0eab341..033afabe9e70 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -3354,7 +3354,7 @@ adaerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) } #endif - return(cam_periph_error(ccb, cam_flags, sense_flags, NULL)); + return(cam_periph_error(ccb, cam_flags, sense_flags)); } static void diff --git a/sys/cam/ata/ata_pmp.c b/sys/cam/ata/ata_pmp.c index ea0b782024b5..e1a4bb8e86b3 100644 --- a/sys/cam/ata/ata_pmp.c +++ b/sys/cam/ata/ata_pmp.c @@ -597,7 +597,7 @@ pmpdone(struct cam_periph *periph, union ccb *done_ccb) priority = done_ccb->ccb_h.pinfo.priority; if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { - if (cam_periph_error(done_ccb, 0, 0, NULL) == ERESTART) { + if (cam_periph_error(done_ccb, 0, 0) == ERESTART) { return; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { cam_release_devq(done_ccb->ccb_h.path, diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index bb9bdce7a1bf..e086171cc341 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -763,8 +763,8 @@ probedone(struct cam_periph *periph, union ccb *done_ccb) if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { if (cam_periph_error(done_ccb, - 0, softc->restart ? (SF_NO_RECOVERY | SF_NO_RETRY) : 0, - NULL) == ERESTART) { + 0, softc->restart ? (SF_NO_RECOVERY | SF_NO_RETRY) : 0 + ) == ERESTART) { out: /* Drop freeze taken due to CAM_DEV_QFREEZE flag set. */ cam_release_devq(path, 0, 0, 0, FALSE); diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c index c788d7fa7cc7..d70813655800 100644 --- a/sys/cam/cam_periph.c +++ b/sys/cam/cam_periph.c @@ -1302,7 +1302,7 @@ camperiphdone(struct cam_periph *periph, union ccb *done_ccb) } } if (cam_periph_error(done_ccb, - 0, SF_RETRY_UA | SF_NO_PRINT, NULL) == ERESTART) + 0, SF_RETRY_UA | SF_NO_PRINT) == ERESTART) goto out; if (done_ccb->ccb_h.status & CAM_DEV_QFRZN) { cam_release_devq(done_ccb->ccb_h.path, 0, 0, 0, 0); @@ -1716,7 +1716,7 @@ sense_error_done: */ int cam_periph_error(union ccb *ccb, cam_flags camflags, - u_int32_t sense_flags, union ccb *save_ccb) + u_int32_t sense_flags) { struct cam_path *newpath; union ccb *orig_ccb, *scan_ccb; diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h index b7f0618ea451..a8f487400b6f 100644 --- a/sys/cam/cam_periph.h +++ b/sys/cam/cam_periph.h @@ -197,7 +197,7 @@ void cam_periph_freeze_after_event(struct cam_periph *periph, struct timeval* event_time, u_int duration_ms); int cam_periph_error(union ccb *ccb, cam_flags camflags, - u_int32_t sense_flags, union ccb *save_ccb); + u_int32_t sense_flags); static __inline struct mtx * cam_periph_mtx(struct cam_periph *periph) diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c index 6969e26c70bd..0ca037f82a98 100644 --- a/sys/cam/mmc/mmc_da.c +++ b/sys/cam/mmc/mmc_da.c @@ -1425,6 +1425,6 @@ sddadone(struct cam_periph *periph, union ccb *done_ccb) static int sddaerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) { - return(cam_periph_error(ccb, cam_flags, sense_flags, NULL)); + return(cam_periph_error(ccb, cam_flags, sense_flags)); } #endif /* _KERNEL */ diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 5e925811a51c..dfaccdcaaeb7 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -407,7 +407,7 @@ ndadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t len xpt_polled_action((union ccb *)&nvmeio); error = cam_periph_error((union ccb *)&nvmeio, - 0, SF_NO_RECOVERY | SF_NO_RETRY, NULL); + 0, SF_NO_RECOVERY | SF_NO_RETRY); if ((nvmeio.ccb_h.status & CAM_DEV_QFRZN) != 0) cam_release_devq(nvmeio.ccb_h.path, /*relsim_flags*/0, /*reduction*/0, /*timeout*/0, /*getcount_only*/0); @@ -426,7 +426,7 @@ ndadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t len xpt_polled_action((union ccb *)&nvmeio); error = cam_periph_error((union ccb *)&nvmeio, - 0, SF_NO_RECOVERY | SF_NO_RETRY, NULL); + 0, SF_NO_RECOVERY | SF_NO_RETRY); if ((nvmeio.ccb_h.status & CAM_DEV_QFRZN) != 0) cam_release_devq(nvmeio.ccb_h.path, /*relsim_flags*/0, /*reduction*/0, /*timeout*/0, /*getcount_only*/0); @@ -1087,7 +1087,7 @@ ndaerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) break; } - return(cam_periph_error(ccb, cam_flags, sense_flags, NULL)); + return(cam_periph_error(ccb, cam_flags, sense_flags)); } /* diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c index 2e684452fd8c..3abd07e0a088 100644 --- a/sys/cam/scsi/scsi_cd.c +++ b/sys/cam/scsi/scsi_cd.c @@ -2593,8 +2593,7 @@ cderror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) if (softc->quirks & CD_Q_RETRY_BUSY) sense_flags |= SF_RETRY_BUSY; - return (cam_periph_error(ccb, cam_flags, sense_flags, - &softc->saved_ccb)); + return (cam_periph_error(ccb, cam_flags, sense_flags)); } static void diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c index fe14ae31e2a0..e3f717fa75e9 100644 --- a/sys/cam/scsi/scsi_ch.c +++ b/sys/cam/scsi/scsi_ch.c @@ -752,8 +752,7 @@ cherror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) periph = xpt_path_periph(ccb->ccb_h.path); softc = (struct ch_softc *)periph->softc; - return (cam_periph_error(ccb, cam_flags, sense_flags, - &softc->saved_ccb)); + return (cam_periph_error(ccb, cam_flags, sense_flags)); } static int diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index 939b890ce37e..6a24ffdb5c21 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -1676,7 +1676,7 @@ dadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t leng xpt_polled_action((union ccb *)&csio); error = cam_periph_error((union ccb *)&csio, - 0, SF_NO_RECOVERY | SF_NO_RETRY, NULL); + 0, SF_NO_RECOVERY | SF_NO_RETRY); if ((csio.ccb_h.status & CAM_DEV_QFRZN) != 0) cam_release_devq(csio.ccb_h.path, /*relsim_flags*/0, /*reduction*/0, /*timeout*/0, /*getcount_only*/0); @@ -1704,7 +1704,7 @@ dadump(void *arg, void *virtual, vm_offset_t physical, off_t offset, size_t leng xpt_polled_action((union ccb *)&csio); error = cam_periph_error((union ccb *)&csio, - 0, SF_NO_RECOVERY | SF_NO_RETRY | SF_QUIET_IR, NULL); + 0, SF_NO_RECOVERY | SF_NO_RETRY | SF_QUIET_IR); if ((csio.ccb_h.status & CAM_DEV_QFRZN) != 0) cam_release_devq(csio.ccb_h.path, /*relsim_flags*/0, /*reduction*/0, /*timeout*/0, /*getcount_only*/0); @@ -5450,8 +5450,7 @@ daerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) if (softc->quirks & DA_Q_RETRY_BUSY) sense_flags |= SF_RETRY_BUSY; - return(cam_periph_error(ccb, cam_flags, sense_flags, - &softc->saved_ccb)); + return(cam_periph_error(ccb, cam_flags, sense_flags)); } static void diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c index 9549aac039ff..b59e8a398be3 100644 --- a/sys/cam/scsi/scsi_enc.c +++ b/sys/cam/scsi/scsi_enc.c @@ -335,7 +335,7 @@ enc_error(union ccb *ccb, uint32_t cflags, uint32_t sflags) periph = xpt_path_periph(ccb->ccb_h.path); softc = (struct enc_softc *)periph->softc; - return (cam_periph_error(ccb, cflags, sflags, &softc->saved_ccb)); + return (cam_periph_error(ccb, cflags, sflags)); } static int diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c index 0a749613b3b3..c0ccc42efdb3 100644 --- a/sys/cam/scsi/scsi_pass.c +++ b/sys/cam/scsi/scsi_pass.c @@ -2277,6 +2277,5 @@ passerror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) periph = xpt_path_periph(ccb->ccb_h.path); softc = (struct pass_softc *)periph->softc; - return(cam_periph_error(ccb, cam_flags, sense_flags, - &softc->saved_ccb)); + return(cam_periph_error(ccb, cam_flags, sense_flags)); } diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c index d73cd4dad6f7..d9e778df994b 100644 --- a/sys/cam/scsi/scsi_pt.c +++ b/sys/cam/scsi/scsi_pt.c @@ -571,8 +571,7 @@ pterror(union ccb *ccb, u_int32_t cam_flags, u_int32_t sense_flags) periph = xpt_path_periph(ccb->ccb_h.path); softc = (struct pt_softc *)periph->softc; - return(cam_periph_error(ccb, cam_flags, sense_flags, - &softc->saved_ccb)); + return(cam_periph_error(ccb, cam_flags, sense_flags)); } static int diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c index 3c505860124f..85c22c42608d 100644 --- a/sys/cam/scsi/scsi_sa.c +++ b/sys/cam/scsi/scsi_sa.c @@ -3469,7 +3469,7 @@ saerror(union ccb *ccb, u_int32_t cflgs, u_int32_t sflgs) /* * Otherwise, we let the common code handle this. */ - return (cam_periph_error(ccb, cflgs, sflgs, &softc->saved_ccb)); + return (cam_periph_error(ccb, cflgs, sflgs)); /* * XXX: To Be Fixed @@ -3482,7 +3482,7 @@ saerror(union ccb *ccb, u_int32_t cflgs, u_int32_t sflgs) } /* FALLTHROUGH */ default: - return (cam_periph_error(ccb, cflgs, sflgs, &softc->saved_ccb)); + return (cam_periph_error(ccb, cflgs, sflgs)); } /* diff --git a/sys/cam/scsi/scsi_sg.c b/sys/cam/scsi/scsi_sg.c index 4b0b640276b7..023860f2bb3b 100644 --- a/sys/cam/scsi/scsi_sg.c +++ b/sys/cam/scsi/scsi_sg.c @@ -943,8 +943,7 @@ sgerror(union ccb *ccb, uint32_t cam_flags, uint32_t sense_flags) periph = xpt_path_periph(ccb->ccb_h.path); softc = (struct sg_softc *)periph->softc; - return (cam_periph_error(ccb, cam_flags, sense_flags, - &softc->saved_ccb)); + return (cam_periph_error(ccb, cam_flags, sense_flags)); } static void diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c index fd3b511c2a6c..8e58a20ca78e 100644 --- a/sys/cam/scsi/scsi_xpt.c +++ b/sys/cam/scsi/scsi_xpt.c @@ -1180,8 +1180,8 @@ probedone(struct cam_periph *periph, union ccb *done_ccb) { if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) { - if (cam_periph_error(done_ccb, 0, - SF_NO_PRINT, NULL) == ERESTART) { + if (cam_periph_error(done_ccb, 0, SF_NO_PRINT) == + ERESTART) { outr: /* Drop freeze taken due to CAM_DEV_QFREEZE */ cam_release_devq(path, 0, 0, 0, FALSE); @@ -1278,8 +1278,7 @@ out: } else if (cam_periph_error(done_ccb, 0, done_ccb->ccb_h.target_lun > 0 ? SF_RETRY_UA|SF_QUIET_IR - : SF_RETRY_UA, - &softc->saved_ccb) == ERESTART) { + : SF_RETRY_UA) == ERESTART) { goto outr; } else { if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { @@ -1321,9 +1320,9 @@ out: if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) { if (cam_periph_error(done_ccb, 0, - done_ccb->ccb_h.target_lun > 0 ? - SF_RETRY_UA|SF_QUIET_IR : SF_RETRY_UA, - &softc->saved_ccb) == ERESTART) { + done_ccb->ccb_h.target_lun > 0 ? + SF_RETRY_UA|SF_QUIET_IR : SF_RETRY_UA) == + ERESTART) { goto outr; } if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { @@ -1427,8 +1426,7 @@ out: page = (struct scsi_control_page *)offset; path->device->queue_flags = page->queue_flags; } else if (cam_periph_error(done_ccb, 0, - SF_RETRY_UA|SF_NO_PRINT, - &softc->saved_ccb) == ERESTART) { + SF_RETRY_UA|SF_NO_PRINT) == ERESTART) { goto outr; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { /* Don't wedge the queue */ @@ -1470,8 +1468,7 @@ out: xpt_schedule(periph, priority); goto out; } else if (cam_periph_error(done_ccb, 0, - SF_RETRY_UA|SF_NO_PRINT, - &softc->saved_ccb) == ERESTART) { + SF_RETRY_UA|SF_NO_PRINT) == ERESTART) { goto outr; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { /* Don't wedge the queue */ @@ -1515,8 +1512,7 @@ out: path->device->device_id = (uint8_t *)devid; } } else if (cam_periph_error(done_ccb, 0, - SF_RETRY_UA, - &softc->saved_ccb) == ERESTART) { + SF_RETRY_UA) == ERESTART) { goto outr; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { /* Don't wedge the queue */ @@ -1558,9 +1554,8 @@ out: path->device->ext_inq_len = length; path->device->ext_inq = (uint8_t *)ext_inq; } - } else if (cam_periph_error(done_ccb, 0, - SF_RETRY_UA, - &softc->saved_ccb) == ERESTART) { + } else if (cam_periph_error(done_ccb, 0, SF_RETRY_UA) == + ERESTART) { goto outr; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { /* Don't wedge the queue */ @@ -1623,8 +1618,7 @@ probe_device_check: path->device->serial_num[slen] = '\0'; } } else if (cam_periph_error(done_ccb, 0, - SF_RETRY_UA|SF_NO_PRINT, - &softc->saved_ccb) == ERESTART) { + SF_RETRY_UA|SF_NO_PRINT) == ERESTART) { goto outr; } else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { /* Don't wedge the queue */ @@ -1693,7 +1687,7 @@ probe_device_check: case PROBE_DV_EXIT: if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) { cam_periph_error(done_ccb, 0, - SF_NO_PRINT | SF_NO_RECOVERY | SF_NO_RETRY, NULL); + SF_NO_PRINT | SF_NO_RECOVERY | SF_NO_RETRY); } if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { /* Don't wedge the queue */ @@ -1744,7 +1738,7 @@ probe_device_check: if (cam_ccb_status(done_ccb) != CAM_REQ_CMP) { cam_periph_error(done_ccb, 0, - SF_NO_PRINT | SF_NO_RECOVERY | SF_NO_RETRY, NULL); + SF_NO_PRINT | SF_NO_RECOVERY | SF_NO_RETRY); } if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) { /* Don't wedge the queue */ |