Date: Tue, 25 May 2021 15:19:05 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 1f348be6f243 - main - cam: remove xpt_polled_action Message-ID: <202105251519.14PFJ5i4000219@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1f348be6f243da1a474c5cf119aa874308f2146f commit 1f348be6f243da1a474c5cf119aa874308f2146f Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2021-05-25 15:16:49 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-05-25 15:18:08 +0000 cam: remove xpt_polled_action Since periph_runccb now handles all the polling stuff, and xpt_polled_action is now unused and can be removed. Sponsored by: Netflix Reviewed by: mav@ Differential Revision: https://reviews.freebsd.org/D30394 --- sys/cam/cam_xpt.c | 22 ---------------------- sys/cam/cam_xpt_periph.h | 1 - 2 files changed, 23 deletions(-) diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index 4bd71f1cd93b..762feaf5dd49 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -3273,28 +3273,6 @@ xpt_pollwait(union ccb *start_ccb, uint32_t timeout) } } -void -xpt_polled_action(union ccb *start_ccb) -{ - uint32_t timeout; - struct cam_ed *dev; - - timeout = start_ccb->ccb_h.timeout * 10; - dev = start_ccb->ccb_h.path->device; - - mtx_unlock(&dev->device_mtx); - - timeout = xpt_poll_setup(start_ccb); - if (timeout > 0) { - xpt_action(start_ccb); - xpt_pollwait(start_ccb, timeout); - } else { - start_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; - } - - mtx_lock(&dev->device_mtx); -} - /* * Schedule a peripheral driver to receive a ccb when its * target device has space for more transactions. diff --git a/sys/cam/cam_xpt_periph.h b/sys/cam/cam_xpt_periph.h index 15d98cc81d1f..f998d3bfa3b8 100644 --- a/sys/cam/cam_xpt_periph.h +++ b/sys/cam/cam_xpt_periph.h @@ -40,7 +40,6 @@ /* Functions accessed by the peripheral drivers */ #ifdef _KERNEL -void xpt_polled_action(union ccb *ccb); void xpt_release_ccb(union ccb *released_ccb); void xpt_schedule(struct cam_periph *perph, u_int32_t new_priority); int32_t xpt_add_periph(struct cam_periph *periph);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105251519.14PFJ5i4000219>