[v4,06/50] scsi: Remove drivers/scsi/scsi.h

Message ID	20220216210233.28774-7-bvanassche@acm.org
State	Superseded
Headers	show Return-Path: <linux-scsi-owner@kernel.org> From: Bart Van Assche <bvanassche@acm.org> To: "Martin K . Petersen" <martin.petersen@oracle.com> Cc: linux-scsi@vger.kernel.org, Bart Van Assche <bvanassche@acm.org>, Christoph Hellwig <hch@lst.de>, Ming Lei <ming.lei@redhat.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Hannes Reinecke <hare@suse.com>, Himanshu Madhani <himanshu.madhani@oracle.com>, Johannes Thumshirn <johannes.thumshirn@wdc.com>, "James E.J. Bottomley" <jejb@linux.ibm.com>, "Juergen E. Fischer" <fischer@norbit.de>, Russell King <linux@armlinux.org.uk>, Adaptec OEM Raid Solutions <aacraid@microsemi.com>, Kashyap Desai <kashyap.desai@broadcom.com>, Sumit Saxena <sumit.saxena@broadcom.com>, Shivasharan S <shivasharan.srikanteshwara@broadcom.com>, Doug Gilbert <dgilbert@interlog.com>, Oliver Neukum <oliver@neukum.org>, Alan Stern <stern@rowland.harvard.edu> Subject: [PATCH v4 06/50] scsi: Remove drivers/scsi/scsi.h Date: Wed, 16 Feb 2022 13:01:49 -0800 Message-Id: <20220216210233.28774-7-bvanassche@acm.org> In-Reply-To: <20220216210233.28774-1-bvanassche@acm.org> References: <20220216210233.28774-1-bvanassche@acm.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Remove the SCSI pointer from struct scsi_cmnd \| expand [v4,00/50] Remove the SCSI pointer from struct scsi_cmnd [v4,01/50] scsi: ips: Remove an unreachable statement [v4,02/50] scsi: ips: Change the return type of ips_release() into 'void' [v4,03/50] scsi: ips: Use true and false instead of TRUE and FALSE [v4,04/50] scsi: nsp_cs: Change the return type of two functions into 'void' [v4,05/50] scsi: nsp_cs: Use true and false instead of TRUE and FALSE [v4,06/50] scsi: Remove drivers/scsi/scsi.h [v4,07/50] scsi: NCR5380: Remove the NCR5380_CMD_SIZE macro [v4,08/50] scsi: NCR5380: Introduce the NCR5380_cmd_priv() function [v4,09/50] scsi: NCR5380: Move the SCSI pointer to private command data [v4,10/50] scsi: arm: Rename arm/scsi.h into arm/arm_scsi.h [v4,11/50] scsi: arm: Move the SCSI pointer to private command data [v4,12/50] scsi: 53c700: Stop clearing SCSI pointer fields [v4,13/50] scsi: aacraid: Move the SCSI pointer to private command data [v4,14/50] scsi: advansys: Move the SCSI pointer to private command data [v4,15/50] scsi: aha1542: Remove a set-but-not-used array [v4,16/50] scsi: aha152x: Move the SCSI pointer to private command data [v4,17/50] scsi: bfa: Stop using the SCSI pointer [v4,18/50] scsi: csio: Stop using the SCSI pointer [v4,19/50] scsi: dc395x: Stop using the SCSI pointer [v4,20/50] scsi: esp_scsi: Stop using the SCSI pointer [v4,21/50] scsi: fdomain: Move the SCSI pointer to private command data [v4,22/50] scsi: fnic: Fix a tracing statement [v4,23/50] scsi: fnic: Stop using the SCSI pointer [v4,24/50] scsi: hptiop: Stop using the SCSI pointer [v4,25/50] scsi: imm: Move the SCSI pointer to private command data [v4,26/50] scsi: iscsi: Stop using the SCSI pointer [v4,27/50] scsi: initio: Stop using the SCSI pointer [v4,28/50] scsi: libfc: Stop using the SCSI pointer [v4,29/50] scsi: bnx2fc: Stop using the SCSI pointer [v4,30/50] scsi: qedf: Stop using the SCSI pointer [v4,31/50] scsi: mac53c94: Fix a set-but-not-used compiler warning [v4,32/50] scsi: mac53c94: Move the SCSI pointer to private command data [v4,33/50] scsi: megaraid: Stop using the SCSI pointer [v4,34/50] scsi: megasas: Stop using the SCSI pointer [v4,35/50] scsi: mesh: Move the SCSI pointer to private command data [v4,36/50] scsi: mvsas: Fix a set-but-not-used warning [v4,37/50] scsi: mvumi: Stop using the SCSI pointer [v4,38/50] scsi: nsp32: Stop using the SCSI pointer [v4,39/50] scsi: nsp_cs: Move the SCSI pointer to private command data [v4,40/50] scsi: sym53c500_cs: Move the SCSI pointer to private command data [v4,41/50] scsi: ppa: Move the SCSI pointer to private command data [v4,42/50] scsi: qla1280: Move the SCSI pointer to private command data [v4,43/50] scsi: qla2xxx: Stop using the SCSI pointer [v4,44/50] scsi: smartpqi: Stop using the SCSI pointer [v4,45/50] scsi: sym53c8xx_2: Move the SCSI pointer to private command data [v4,46/50] scsi: usb: Stop using the SCSI pointer [v4,47/50] scsi: wd719x: Stop using the SCSI pointer [v4,48/50] scsi: wd33c93: Move the SCSI pointer to private command data [v4,49/50] scsi: zalon: Stop using the SCSI pointer [v4,50/50] scsi: core: Remove struct scsi_pointer from struct scsi_cmnd

diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c index 5853db36eceb..bcbce23478b8 100644 --- a/drivers/scsi/a2091.c +++ b/drivers/scsi/a2091.c @@ -12,7 +12,11 @@ #include <asm/amigaints.h> #include <asm/amigahw.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> +#include <scsi/scsi_tcq.h> #include "wd33c93.h" #include "a2091.h" diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c index 86f1da22aaa5..23f34411f7bf 100644 --- a/drivers/scsi/a3000.c +++ b/drivers/scsi/a3000.c @@ -13,7 +13,11 @@ #include <asm/amigaints.h> #include <asm/amigahw.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> +#include <scsi/scsi_tcq.h> #include "wd33c93.h" #include "a3000.h" diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index d17880b57d17..901b78e8ffe6 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c @@ -243,13 +243,16 @@ #include <linux/workqueue.h> #include <linux/list.h> #include <linux/slab.h> -#include <scsi/scsicam.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> #include <scsi/scsi_dbg.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include <scsi/scsi_transport_spi.h> -#include <scsi/scsi_eh.h> +#include <scsi/scsicam.h> #include "aha152x.h" static LIST_HEAD(aha152x_host_list); diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c index 18eb4cfcef9a..134255751819 100644 --- a/drivers/scsi/aha1740.c +++ b/drivers/scsi/aha1740.c @@ -55,8 +55,12 @@ #include <asm/dma.h> #include <asm/io.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "aha1740.h" /* IF YOU ARE HAVING PROBLEMS WITH THIS DRIVER, AND WANT TO WATCH diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c index 81eb3bbdfc51..a8a72d822862 100644 --- a/drivers/scsi/arm/acornscsi.c +++ b/drivers/scsi/arm/acornscsi.c @@ -126,9 +126,13 @@ #include <asm/ecard.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> #include <scsi/scsi_dbg.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include <scsi/scsi_transport_spi.h> #include "acornscsi.h" #include "msgqueue.h" diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c index 7f667c198f6d..2527b542bcdd 100644 --- a/drivers/scsi/arm/arxescsi.c +++ b/drivers/scsi/arm/arxescsi.c @@ -35,8 +35,12 @@ #include <asm/io.h> #include <asm/ecard.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "fas216.h" struct arxescsi_info { diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c index 3c00d7773876..536d6646e40b 100644 --- a/drivers/scsi/arm/cumana_2.c +++ b/drivers/scsi/arm/cumana_2.c @@ -29,8 +29,12 @@ #include <asm/ecard.h> #include <asm/io.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "fas216.h" #include "scsi.h" diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c index 1394590eecea..ab0f6422a6a9 100644 --- a/drivers/scsi/arm/eesox.c +++ b/drivers/scsi/arm/eesox.c @@ -35,8 +35,12 @@ #include <asm/dma.h> #include <asm/ecard.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "fas216.h" #include "scsi.h" diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c index 7019b91f0ce6..0d6df5ebf934 100644 --- a/drivers/scsi/arm/fas216.c +++ b/drivers/scsi/arm/fas216.c @@ -47,9 +47,13 @@ #include <asm/irq.h> #include <asm/ecard.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> #include <scsi/scsi_dbg.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "fas216.h" #include "scsi.h" diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c index 8fec435cee18..797568b271e3 100644 --- a/drivers/scsi/arm/powertec.c +++ b/drivers/scsi/arm/powertec.c @@ -20,8 +20,12 @@ #include <asm/ecard.h> #include <asm/io.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "fas216.h" #include "scsi.h" diff --git a/drivers/scsi/arm/queue.c b/drivers/scsi/arm/queue.c index c6f71a7d1b8e..978df23ce188 100644 --- a/drivers/scsi/arm/queue.c +++ b/drivers/scsi/arm/queue.c @@ -20,7 +20,11 @@ #include <linux/list.h> #include <linux/init.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> +#include <scsi/scsi_tcq.h> #define DEBUG diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c index 727f8c8f30b5..43754c2f36b3 100644 --- a/drivers/scsi/gvp11.c +++ b/drivers/scsi/gvp11.c @@ -12,7 +12,11 @@ #include <asm/amigaints.h> #include <asm/amigahw.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> +#include <scsi/scsi_tcq.h> #include "wd33c93.h" #include "gvp11.h" diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index d22ba53d6028..16419aeec02d 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c @@ -180,9 +180,13 @@ #include <linux/types.h> #include <linux/dma-mapping.h> -#include <scsi/sg.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> +#include <scsi/sg.h> #include "ips.h" diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index bf987f3a7f3f..2061e3fe9824 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -44,10 +44,14 @@ #include <linux/dma-mapping.h> #include <linux/mutex.h> #include <linux/slab.h> -#include <scsi/scsicam.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> +#include <scsi/scsicam.h> #include "megaraid.h" diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c index 869b8b058a43..0893d4c3a916 100644 --- a/drivers/scsi/mvme147.c +++ b/drivers/scsi/mvme147.c @@ -11,8 +11,12 @@ #include <asm/mvme147hw.h> #include <asm/irq.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "wd33c93.h" #include "mvme147.h" diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c index df82a349e969..6a6621728c69 100644 --- a/drivers/scsi/pcmcia/aha152x_stub.c +++ b/drivers/scsi/pcmcia/aha152x_stub.c @@ -40,13 +40,16 @@ #include <linux/slab.h> #include <linux/string.h> #include <linux/ioport.h> -#include <scsi/scsi.h> #include <linux/major.h> #include <linux/blkdev.h> -#include <scsi/scsi_ioctl.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_ioctl.h> +#include <scsi/scsi_tcq.h> #include "aha152x.h" #include <pcmcia/cistpl.h> diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index a78a86511e94..dcffda384eaf 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c @@ -41,10 +41,9 @@ #include <asm/io.h> #include <asm/irq.h> -#include <../drivers/scsi/scsi.h> -#include <scsi/scsi_host.h> - #include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_host.h> #include <scsi/scsi_ioctl.h> #include <pcmcia/cistpl.h> diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c index 828d53faf09a..310d0b6586a6 100644 --- a/drivers/scsi/pcmcia/qlogic_stub.c +++ b/drivers/scsi/pcmcia/qlogic_stub.c @@ -38,14 +38,17 @@ #include <linux/string.h> #include <linux/ioport.h> #include <asm/io.h> -#include <scsi/scsi.h> #include <linux/major.h> #include <linux/blkdev.h> -#include <scsi/scsi_ioctl.h> #include <linux/interrupt.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_ioctl.h> +#include <scsi/scsi_tcq.h> #include "../qlogicfas408.h" #include <pcmcia/cistpl.h> diff --git a/drivers/scsi/qlogicfas.c b/drivers/scsi/qlogicfas.c index 8f709002f746..8f05e3707d69 100644 --- a/drivers/scsi/qlogicfas.c +++ b/drivers/scsi/qlogicfas.c @@ -31,8 +31,12 @@ #include <asm/irq.h> #include <asm/dma.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "qlogicfas408.h" /* Set the following to 2 to use normal interrupt (active high/totempole- diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c index 30a88849a626..3e065d5fc80c 100644 --- a/drivers/scsi/qlogicfas408.c +++ b/drivers/scsi/qlogicfas408.c @@ -55,8 +55,12 @@ #include <asm/irq.h> #include <asm/dma.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "qlogicfas408.h" /*----------------------------------------------------------------*/ diff --git a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h deleted file mode 100644 index 4fd75a3aff66..000000000000 --- a/drivers/scsi/scsi.h +++ /dev/null @@ -1,46 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * scsi.h Copyright (C) 1992 Drew Eckhardt - * Copyright (C) 1993, 1994, 1995, 1998, 1999 Eric Youngdale - * generic SCSI package header file by - * Initial versions: Drew Eckhardt - * Subsequent revisions: Eric Youngdale - * - * <drew@colorado.edu> - * - * Modified by Eric Youngdale eric@andante.org to - * add scatter-gather, multiple outstanding request, and other - * enhancements. - */ -/* - * NOTE: this file only contains compatibility glue for old drivers. All - * these wrappers will be removed sooner or later. For new code please use - * the interfaces declared in the headers in include/scsi/ - */ - -#ifndef _SCSI_H -#define _SCSI_H - -#include <scsi/scsi_cmnd.h> -#include <scsi/scsi_device.h> -#include <scsi/scsi_eh.h> -#include <scsi/scsi_tcq.h> -#include <scsi/scsi.h> - -/* - * Some defs, in case these are not defined elsewhere. - */ -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - -struct Scsi_Host; -struct scsi_cmnd; -struct scsi_device; -struct scsi_target; -struct scatterlist; - -#endif /* _SCSI_H */ diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 6b43e97bd417..bbd75026ec93 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -49,11 +49,15 @@ static int sg_version_num = 30536; /* 2 digits for each component */ #include <linux/uio.h> #include <linux/cred.h> /* for sg_check_file_access() */ -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> #include <scsi/scsi_dbg.h> -#include <scsi/scsi_host.h> +#include <scsi/scsi_device.h> #include <scsi/scsi_driver.h> +#include <scsi/scsi_eh.h> +#include <scsi/scsi_host.h> #include <scsi/scsi_ioctl.h> +#include <scsi/scsi_tcq.h> #include <scsi/sg.h> #include "scsi_logging.h" diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c index cf1030c9dda1..e797d89c873b 100644 --- a/drivers/scsi/sgiwd93.c +++ b/drivers/scsi/sgiwd93.c @@ -28,7 +28,11 @@ #include <asm/sgi/ip22.h> #include <asm/sgi/wd.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> +#include <scsi/scsi_tcq.h> #include "wd33c93.h" struct ip22_hostdata { diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c index b8dc6fa6a5a3..874ea4b54ced 100644 --- a/drivers/usb/image/microtek.c +++ b/drivers/usb/image/microtek.c @@ -130,11 +130,15 @@ #include <linux/spinlock.h> #include <linux/usb.h> #include <linux/proc_fs.h> - #include <linux/atomic.h> #include <linux/blkdev.h> -#include "../../scsi/scsi.h" + +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "microtek.h" diff --git a/drivers/usb/storage/debug.c b/drivers/usb/storage/debug.c index d7f50b7a079e..576be66ad962 100644 --- a/drivers/usb/storage/debug.c +++ b/drivers/usb/storage/debug.c @@ -36,7 +36,6 @@ #include "usb.h" #include "debug.h" -#include "scsi.h" void usb_stor_show_command(const struct us_data *us, struct scsi_cmnd *srb)

[v4,06/50] scsi: Remove drivers/scsi/scsi.h

Commit Message

Patch