From owner-dev-commits-src-all@freebsd.org Tue May 25 15:19:05 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B41BC64E8A9; Tue, 25 May 2021 15:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FqHmT3l9Lz3Hwm; Tue, 25 May 2021 15:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4176A1FAD2; Tue, 25 May 2021 15:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14PFJ5ne000220; Tue, 25 May 2021 15:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14PFJ5i4000219; Tue, 25 May 2021 15:19:05 GMT (envelope-from git) Date: Tue, 25 May 2021 15:19:05 GMT Message-Id: <202105251519.14PFJ5i4000219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1f348be6f243 - main - cam: remove xpt_polled_action MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f348be6f243da1a474c5cf119aa874308f2146f Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 May 2021 15:19:05 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1f348be6f243da1a474c5cf119aa874308f2146f commit 1f348be6f243da1a474c5cf119aa874308f2146f Author: Warner Losh AuthorDate: 2021-05-25 15:16:49 +0000 Commit: Warner Losh 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);