From nobody Mon Nov 06 18:56:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPLDF2jNQz4yg6l; Mon, 6 Nov 2023 18:56:29 +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 4SPLDF2HN2z4ctH; Mon, 6 Nov 2023 18:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699296989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4vyXAmW4zFbpXyW06Kxcv22j4I7zwyF+k/QwfPg+67U=; b=g2ymLcYc6nqvN2DiHkg3GLMt4XPr7zzPD8aDnf5FmVzjf00BL6QVxNwiwXFO3WNb4AqSsn cfZ67bDR4xg/dnpluy5U93dzX86k5Hn4b3PIXbfAEpQex6em6ucy0uVfHl0yLeVP4X9xs8 1emaa4epRhnj/ZBjLtKOjSweIM07/LjDTFWrZym83HgJPunkwLbSZtgW7c7rM8B5H6nR5o 6ouPsoQ35bm6bNVe4By2YwKJ9bpLJN9yn8dBprcd/H4jwnnVYU21oxlHOwQjzYF12U7uo1 Q5gksPTn2kKNIh5AoGd4/cJvT6GBRHmNk8CQajUVEmj4NtLnzsG+k431wPJzaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699296989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4vyXAmW4zFbpXyW06Kxcv22j4I7zwyF+k/QwfPg+67U=; b=e2Ik/Wwk3ObUHll5L1/mamuKgH/bKqj9b0lDZ1ivPDfjfOEslD0C8POtfqwUsMeDZhFyQN p78zb6HQpnrus5Z/BjQXUkGArj84UpAjChc3+LAlkHQ4ysr9QYoDnCHv/GPNcNcL3D+EVL +E1m26FRVFB/nuSMMUT19DTzRlMt0P3Lb4a+V6lLP8+8tSFLDHPsz9mZTIVU5LenkF8tYt yExTXJtv0FrOnbCks4r9fsi1LZvppYdnxMQw1bI8Jov3N9cwEmQtyNl/IOiS0pBSOf0siy 0SwNaJP13MWYlXoXi1vNhLj7PJN0IG4eNdW5dBJ5LtF/xHhVCUYZhtuL+fmOkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699296989; a=rsa-sha256; cv=none; b=f/zAkEzYc72zKMlaU/PKDZbXQj21gZBnbXBIo3IujZFEVMp/UJtqtEf5TzsBGD86Xou24s FfYDxcYADEnJ3U29u8w8+yMwcs482ZBbmY/QV9FrNSbcMUaXvO1eX9AWOtkorH5v91r/G2 G8EPdELYSfK+ffLZ+vmyBPbRe7C/1iEZ+BrsvEbo8Ih3P9EkV+93y2dpf6CIq1p/PkdDHN 0pYYU5gPKtkOR7Wc9/FYgiCFXh7fVaK1MTFHA4RYGd5mENj/QtTY/rDv1VqABQCFIxXmxM z3DoqMLg3ZhpPU7neXeCGRygjPClLAIHCcQsyyY6YrROJMx+o83FMnX2vM5A4Q== 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 4SPLDF1DKtz4Gm; Mon, 6 Nov 2023 18:56:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6IuTFv076021; Mon, 6 Nov 2023 18:56:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6IuTp6076018; Mon, 6 Nov 2023 18:56:29 GMT (envelope-from git) Date: Mon, 6 Nov 2023 18:56:29 GMT Message-Id: <202311061856.3A6IuTp6076018@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: fd9a4a67d053 - main - cam: Minor opt_cam.h cleanup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org 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: fd9a4a67d053a51349ba6eba5ea61a7cd2cf20af Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fd9a4a67d053a51349ba6eba5ea61a7cd2cf20af commit fd9a4a67d053a51349ba6eba5ea61a7cd2cf20af Author: Warner Losh AuthorDate: 2023-11-06 17:47:15 +0000 Commit: Warner Losh CommitDate: 2023-11-06 17:47:15 +0000 cam: Minor opt_cam.h cleanup sys/cam/cam.h includes opt_cam.h, so none of the clients need to do this. cam.h does all the right dancing to conditionally include opt_cam.h only when it makes sense. It generally only matters when cam_debug.h is included (it must be included before that). Many of the stray opt_cam.h includes were after cam_debug.h which would be a problem were it not included in cam/cam.h. The other users of CAM options that aren't debug all already include cam/cam.h. Also trim unneeded sys/cdefs.h files from the files touched. Sponsored by: Netflix --- sys/cam/ata/ata_xpt.c | 2 -- sys/cam/cam_compat.c | 2 -- sys/cam/cam_iosched.c | 3 --- sys/cam/cam_xpt.c | 2 -- sys/cam/mmc/mmc_xpt.c | 2 -- sys/cam/nvme/nvme_xpt.c | 2 -- sys/cam/scsi/scsi_xpt.c | 2 -- sys/dev/nvme/nvme_ctrlr.c | 2 -- sys/dev/sdio/sdiob.c | 3 --- 9 files changed, 20 deletions(-) diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c index feece601a6a9..1b759f55ee8a 100644 --- a/sys/cam/ata/ata_xpt.c +++ b/sys/cam/ata/ata_xpt.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include @@ -59,7 +58,6 @@ #include #include #include /* for xpt_print below */ -#include "opt_cam.h" struct ata_quirk_entry { struct scsi_inquiry_pattern inq_pat; diff --git a/sys/cam/cam_compat.c b/sys/cam/cam_compat.c index c377763fc7c5..d95a11e80c2e 100644 --- a/sys/cam/cam_compat.c +++ b/sys/cam/cam_compat.c @@ -50,8 +50,6 @@ #include -#include "opt_cam.h" - static int cam_compat_handle_0x17(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td, d_ioctl_t *cbfnp); static int cam_compat_handle_0x18(struct cdev *dev, u_long cmd, caddr_t addr, diff --git a/sys/cam/cam_iosched.c b/sys/cam/cam_iosched.c index 739fe34ef184..b83ab9699425 100644 --- a/sys/cam/cam_iosched.c +++ b/sys/cam/cam_iosched.c @@ -27,12 +27,9 @@ * SUCH DAMAGE. */ -#include "opt_cam.h" #include "opt_ddb.h" -#include #include - #include #include #include diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c index a1dec7a8a674..dc423991fd58 100644 --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -71,8 +71,6 @@ #include /* for xpt_print below */ -#include "opt_cam.h" - /* Wild guess based on not wanting to grow the stack too much */ #define XPT_PRINT_MAXLEN 512 #ifdef PRINTF_BUFR_SIZE diff --git a/sys/cam/mmc/mmc_xpt.c b/sys/cam/mmc/mmc_xpt.c index 41b3f5146530..c8b57c2d8d86 100644 --- a/sys/cam/mmc/mmc_xpt.c +++ b/sys/cam/mmc/mmc_xpt.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include @@ -61,7 +60,6 @@ #include /* for xpt_print below */ #include /* for PRIu64 */ -#include "opt_cam.h" FEATURE(mmccam, "CAM-based MMC/SD/SDIO stack"); diff --git a/sys/cam/nvme/nvme_xpt.c b/sys/cam/nvme/nvme_xpt.c index 54dc81cfef7e..8b9fbcd21291 100644 --- a/sys/cam/nvme/nvme_xpt.c +++ b/sys/cam/nvme/nvme_xpt.c @@ -27,7 +27,6 @@ * derived from ata_xpt.c: Copyright (c) 2009 Alexander Motin */ -#include #include #include #include @@ -59,7 +58,6 @@ #include #include #include /* for xpt_print below */ -#include "opt_cam.h" struct nvme_quirk_entry { u_int quirks; diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c index 9e936330fb27..42f290765c53 100644 --- a/sys/cam/scsi/scsi_xpt.c +++ b/sys/cam/scsi/scsi_xpt.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include @@ -61,7 +60,6 @@ #include #include #include /* for xpt_print below */ -#include "opt_cam.h" struct scsi_quirk_entry { struct scsi_inquiry_pattern inq_pat; diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index b72359a061da..5d72f707d3b1 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#include -#include "opt_cam.h" #include "opt_nvme.h" #include diff --git a/sys/dev/sdio/sdiob.c b/sys/dev/sdio/sdiob.c index e60e8759599f..60389c419e35 100644 --- a/sys/dev/sdio/sdiob.c +++ b/sys/dev/sdio/sdiob.c @@ -62,9 +62,6 @@ * messages from MMCCAM to newbus and back. */ -#include -#include "opt_cam.h" - #include #include #include