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
This commit is contained in:
Warner Losh 2023-11-06 10:47:15 -07:00
parent c1e2146821
commit fd9a4a67d0
9 changed files with 0 additions and 20 deletions

View file

@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/endian.h>
@ -59,7 +58,6 @@
#include <cam/scsi/scsi_message.h>
#include <cam/ata/ata_all.h>
#include <machine/stdarg.h> /* for xpt_print below */
#include "opt_cam.h"
struct ata_quirk_entry {
struct scsi_inquiry_pattern inq_pat;

View file

@ -50,8 +50,6 @@
#include <cam/scsi/scsi_pass.h>
#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,

View file

@ -27,12 +27,9 @@
* SUCH DAMAGE.
*/
#include "opt_cam.h"
#include "opt_ddb.h"
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/bio.h>

View file

@ -71,8 +71,6 @@
#include <machine/stdarg.h> /* 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

View file

@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/endian.h>
@ -61,7 +60,6 @@
#include <machine/stdarg.h> /* for xpt_print below */
#include <machine/_inttypes.h> /* for PRIu64 */
#include "opt_cam.h"
FEATURE(mmccam, "CAM-based MMC/SD/SDIO stack");

View file

@ -27,7 +27,6 @@
* derived from ata_xpt.c: Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/endian.h>
@ -59,7 +58,6 @@
#include <cam/scsi/scsi_message.h>
#include <cam/nvme/nvme_all.h>
#include <machine/stdarg.h> /* for xpt_print below */
#include "opt_cam.h"
struct nvme_quirk_entry {
u_int quirks;

View file

@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/systm.h>
@ -61,7 +60,6 @@
#include <cam/scsi/scsi_message.h>
#include <cam/scsi/scsi_pass.h>
#include <machine/stdarg.h> /* for xpt_print below */
#include "opt_cam.h"
struct scsi_quirk_entry {
struct scsi_inquiry_pattern inq_pat;

View file

@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
#include "opt_cam.h"
#include "opt_nvme.h"
#include <sys/param.h>

View file

@ -62,9 +62,6 @@
* messages from MMCCAM to newbus and back.
*/
#include <sys/cdefs.h>
#include "opt_cam.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>