tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

scsi: Remove drivers/scsi/scsi.h

The following two header files have the same file name: include/scsi/scsi.h
and drivers/scsi/scsi.h. This is confusing. Remove the latter since the
following note was added in drivers/scsi/scsi.h in 2004:

"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/"

Link: https://lore.kernel.org/r/20220218195117.25689-7-bvanassche@acm.org
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Bart Van Assche and committed by
Martin K. Petersen 53555fb7 dfab1e53

+120 -83
+5 -1
drivers/scsi/a2091.c
··· 12 12 #include <asm/amigaints.h> 13 13 #include <asm/amigahw.h> 14 14 15 - #include "scsi.h" 15 + #include <scsi/scsi.h> 16 + #include <scsi/scsi_cmnd.h> 17 + #include <scsi/scsi_device.h> 18 + #include <scsi/scsi_eh.h> 19 + #include <scsi/scsi_tcq.h> 16 20 #include "wd33c93.h" 17 21 #include "a2091.h" 18 22
+5 -1
drivers/scsi/a3000.c
··· 13 13 #include <asm/amigaints.h> 14 14 #include <asm/amigahw.h> 15 15 16 - #include "scsi.h" 16 + #include <scsi/scsi.h> 17 + #include <scsi/scsi_cmnd.h> 18 + #include <scsi/scsi_device.h> 19 + #include <scsi/scsi_eh.h> 20 + #include <scsi/scsi_tcq.h> 17 21 #include "wd33c93.h" 18 22 #include "a3000.h" 19 23
+7 -4
drivers/scsi/aha152x.c
··· 243 243 #include <linux/workqueue.h> 244 244 #include <linux/list.h> 245 245 #include <linux/slab.h> 246 - #include <scsi/scsicam.h> 247 246 248 - #include "scsi.h" 247 + #include <scsi/scsi.h> 248 + #include <scsi/scsi_cmnd.h> 249 249 #include <scsi/scsi_dbg.h> 250 - #include <scsi/scsi_host.h> 251 - #include <scsi/scsi_transport_spi.h> 250 + #include <scsi/scsi_device.h> 252 251 #include <scsi/scsi_eh.h> 252 + #include <scsi/scsi_host.h> 253 + #include <scsi/scsi_tcq.h> 254 + #include <scsi/scsi_transport_spi.h> 255 + #include <scsi/scsicam.h> 253 256 #include "aha152x.h" 254 257 255 258 static LIST_HEAD(aha152x_host_list);
+5 -1
drivers/scsi/aha1740.c
··· 55 55 #include <asm/dma.h> 56 56 #include <asm/io.h> 57 57 58 - #include "scsi.h" 58 + #include <scsi/scsi.h> 59 + #include <scsi/scsi_cmnd.h> 60 + #include <scsi/scsi_device.h> 61 + #include <scsi/scsi_eh.h> 59 62 #include <scsi/scsi_host.h> 63 + #include <scsi/scsi_tcq.h> 60 64 #include "aha1740.h" 61 65 62 66 /* IF YOU ARE HAVING PROBLEMS WITH THIS DRIVER, AND WANT TO WATCH
+5 -1
drivers/scsi/arm/acornscsi.c
··· 126 126 127 127 #include <asm/ecard.h> 128 128 129 - #include "../scsi.h" 129 + #include <scsi/scsi.h> 130 + #include <scsi/scsi_cmnd.h> 130 131 #include <scsi/scsi_dbg.h> 132 + #include <scsi/scsi_device.h> 133 + #include <scsi/scsi_eh.h> 131 134 #include <scsi/scsi_host.h> 135 + #include <scsi/scsi_tcq.h> 132 136 #include <scsi/scsi_transport_spi.h> 133 137 #include "acornscsi.h" 134 138 #include "msgqueue.h"
+5 -1
drivers/scsi/arm/arxescsi.c
··· 35 35 #include <asm/io.h> 36 36 #include <asm/ecard.h> 37 37 38 - #include "../scsi.h" 38 + #include <scsi/scsi.h> 39 + #include <scsi/scsi_cmnd.h> 40 + #include <scsi/scsi_device.h> 41 + #include <scsi/scsi_eh.h> 39 42 #include <scsi/scsi_host.h> 43 + #include <scsi/scsi_tcq.h> 40 44 #include "fas216.h" 41 45 42 46 struct arxescsi_info {
+5 -1
drivers/scsi/arm/cumana_2.c
··· 29 29 #include <asm/ecard.h> 30 30 #include <asm/io.h> 31 31 32 - #include "../scsi.h" 32 + #include <scsi/scsi.h> 33 + #include <scsi/scsi_cmnd.h> 34 + #include <scsi/scsi_device.h> 35 + #include <scsi/scsi_eh.h> 33 36 #include <scsi/scsi_host.h> 37 + #include <scsi/scsi_tcq.h> 34 38 #include "fas216.h" 35 39 #include "scsi.h" 36 40
+5 -1
drivers/scsi/arm/eesox.c
··· 35 35 #include <asm/dma.h> 36 36 #include <asm/ecard.h> 37 37 38 - #include "../scsi.h" 38 + #include <scsi/scsi.h> 39 + #include <scsi/scsi_cmnd.h> 40 + #include <scsi/scsi_device.h> 41 + #include <scsi/scsi_eh.h> 39 42 #include <scsi/scsi_host.h> 43 + #include <scsi/scsi_tcq.h> 40 44 #include "fas216.h" 41 45 #include "scsi.h" 42 46
+5 -1
drivers/scsi/arm/fas216.c
··· 47 47 #include <asm/irq.h> 48 48 #include <asm/ecard.h> 49 49 50 - #include "../scsi.h" 50 + #include <scsi/scsi.h> 51 + #include <scsi/scsi_cmnd.h> 51 52 #include <scsi/scsi_dbg.h> 53 + #include <scsi/scsi_device.h> 54 + #include <scsi/scsi_eh.h> 52 55 #include <scsi/scsi_host.h> 56 + #include <scsi/scsi_tcq.h> 53 57 #include "fas216.h" 54 58 #include "scsi.h" 55 59
+5 -1
drivers/scsi/arm/powertec.c
··· 20 20 #include <asm/ecard.h> 21 21 #include <asm/io.h> 22 22 23 - #include "../scsi.h" 23 + #include <scsi/scsi.h> 24 + #include <scsi/scsi_cmnd.h> 25 + #include <scsi/scsi_device.h> 26 + #include <scsi/scsi_eh.h> 24 27 #include <scsi/scsi_host.h> 28 + #include <scsi/scsi_tcq.h> 25 29 #include "fas216.h" 26 30 #include "scsi.h" 27 31
+5 -1
drivers/scsi/arm/queue.c
··· 20 20 #include <linux/list.h> 21 21 #include <linux/init.h> 22 22 23 - #include "../scsi.h" 23 + #include <scsi/scsi.h> 24 + #include <scsi/scsi_cmnd.h> 25 + #include <scsi/scsi_device.h> 26 + #include <scsi/scsi_eh.h> 27 + #include <scsi/scsi_tcq.h> 24 28 25 29 #define DEBUG 26 30
+5 -1
drivers/scsi/gvp11.c
··· 12 12 #include <asm/amigaints.h> 13 13 #include <asm/amigahw.h> 14 14 15 - #include "scsi.h" 15 + #include <scsi/scsi.h> 16 + #include <scsi/scsi_cmnd.h> 17 + #include <scsi/scsi_device.h> 18 + #include <scsi/scsi_eh.h> 19 + #include <scsi/scsi_tcq.h> 16 20 #include "wd33c93.h" 17 21 #include "gvp11.h" 18 22
+6 -2
drivers/scsi/ips.c
··· 180 180 #include <linux/types.h> 181 181 #include <linux/dma-mapping.h> 182 182 183 - #include <scsi/sg.h> 184 - #include "scsi.h" 183 + #include <scsi/scsi.h> 184 + #include <scsi/scsi_cmnd.h> 185 + #include <scsi/scsi_device.h> 186 + #include <scsi/scsi_eh.h> 185 187 #include <scsi/scsi_host.h> 188 + #include <scsi/scsi_tcq.h> 189 + #include <scsi/sg.h> 186 190 187 191 #include "ips.h" 188 192
+6 -2
drivers/scsi/megaraid.c
··· 44 44 #include <linux/dma-mapping.h> 45 45 #include <linux/mutex.h> 46 46 #include <linux/slab.h> 47 - #include <scsi/scsicam.h> 48 47 49 - #include "scsi.h" 48 + #include <scsi/scsi.h> 49 + #include <scsi/scsi_cmnd.h> 50 + #include <scsi/scsi_device.h> 51 + #include <scsi/scsi_eh.h> 50 52 #include <scsi/scsi_host.h> 53 + #include <scsi/scsi_tcq.h> 54 + #include <scsi/scsicam.h> 51 55 52 56 #include "megaraid.h" 53 57
+5 -1
drivers/scsi/mvme147.c
··· 11 11 #include <asm/mvme147hw.h> 12 12 #include <asm/irq.h> 13 13 14 - #include "scsi.h" 14 + #include <scsi/scsi.h> 15 + #include <scsi/scsi_cmnd.h> 16 + #include <scsi/scsi_device.h> 17 + #include <scsi/scsi_eh.h> 15 18 #include <scsi/scsi_host.h> 19 + #include <scsi/scsi_tcq.h> 16 20 #include "wd33c93.h" 17 21 #include "mvme147.h" 18 22
+6 -3
drivers/scsi/pcmcia/aha152x_stub.c
··· 40 40 #include <linux/slab.h> 41 41 #include <linux/string.h> 42 42 #include <linux/ioport.h> 43 - #include <scsi/scsi.h> 44 43 #include <linux/major.h> 45 44 #include <linux/blkdev.h> 46 - #include <scsi/scsi_ioctl.h> 47 45 48 - #include "scsi.h" 46 + #include <scsi/scsi.h> 47 + #include <scsi/scsi_cmnd.h> 48 + #include <scsi/scsi_device.h> 49 + #include <scsi/scsi_eh.h> 49 50 #include <scsi/scsi_host.h> 51 + #include <scsi/scsi_ioctl.h> 52 + #include <scsi/scsi_tcq.h> 50 53 #include "aha152x.h" 51 54 52 55 #include <pcmcia/cistpl.h>
+2 -3
drivers/scsi/pcmcia/nsp_cs.c
··· 41 41 #include <asm/io.h> 42 42 #include <asm/irq.h> 43 43 44 - #include <../drivers/scsi/scsi.h> 45 - #include <scsi/scsi_host.h> 46 - 47 44 #include <scsi/scsi.h> 45 + #include <scsi/scsi_cmnd.h> 46 + #include <scsi/scsi_host.h> 48 47 #include <scsi/scsi_ioctl.h> 49 48 50 49 #include <pcmcia/cistpl.h>
+6 -3
drivers/scsi/pcmcia/qlogic_stub.c
··· 38 38 #include <linux/string.h> 39 39 #include <linux/ioport.h> 40 40 #include <asm/io.h> 41 - #include <scsi/scsi.h> 42 41 #include <linux/major.h> 43 42 #include <linux/blkdev.h> 44 - #include <scsi/scsi_ioctl.h> 45 43 #include <linux/interrupt.h> 46 44 47 - #include "scsi.h" 45 + #include <scsi/scsi.h> 46 + #include <scsi/scsi_cmnd.h> 47 + #include <scsi/scsi_device.h> 48 + #include <scsi/scsi_eh.h> 48 49 #include <scsi/scsi_host.h> 50 + #include <scsi/scsi_ioctl.h> 51 + #include <scsi/scsi_tcq.h> 49 52 #include "../qlogicfas408.h" 50 53 51 54 #include <pcmcia/cistpl.h>
+5 -1
drivers/scsi/qlogicfas.c
··· 31 31 #include <asm/irq.h> 32 32 #include <asm/dma.h> 33 33 34 - #include "scsi.h" 34 + #include <scsi/scsi.h> 35 + #include <scsi/scsi_cmnd.h> 36 + #include <scsi/scsi_device.h> 37 + #include <scsi/scsi_eh.h> 35 38 #include <scsi/scsi_host.h> 39 + #include <scsi/scsi_tcq.h> 36 40 #include "qlogicfas408.h" 37 41 38 42 /* Set the following to 2 to use normal interrupt (active high/totempole-
+5 -1
drivers/scsi/qlogicfas408.c
··· 55 55 #include <asm/irq.h> 56 56 #include <asm/dma.h> 57 57 58 - #include "scsi.h" 58 + #include <scsi/scsi.h> 59 + #include <scsi/scsi_cmnd.h> 60 + #include <scsi/scsi_device.h> 61 + #include <scsi/scsi_eh.h> 59 62 #include <scsi/scsi_host.h> 63 + #include <scsi/scsi_tcq.h> 60 64 #include "qlogicfas408.h" 61 65 62 66 /*----------------------------------------------------------------*/
-46
drivers/scsi/scsi.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - /* 3 - * scsi.h Copyright (C) 1992 Drew Eckhardt 4 - * Copyright (C) 1993, 1994, 1995, 1998, 1999 Eric Youngdale 5 - * generic SCSI package header file by 6 - * Initial versions: Drew Eckhardt 7 - * Subsequent revisions: Eric Youngdale 8 - * 9 - * <drew@colorado.edu> 10 - * 11 - * Modified by Eric Youngdale eric@andante.org to 12 - * add scatter-gather, multiple outstanding request, and other 13 - * enhancements. 14 - */ 15 - /* 16 - * NOTE: this file only contains compatibility glue for old drivers. All 17 - * these wrappers will be removed sooner or later. For new code please use 18 - * the interfaces declared in the headers in include/scsi/ 19 - */ 20 - 21 - #ifndef _SCSI_H 22 - #define _SCSI_H 23 - 24 - #include <scsi/scsi_cmnd.h> 25 - #include <scsi/scsi_device.h> 26 - #include <scsi/scsi_eh.h> 27 - #include <scsi/scsi_tcq.h> 28 - #include <scsi/scsi.h> 29 - 30 - /* 31 - * Some defs, in case these are not defined elsewhere. 32 - */ 33 - #ifndef TRUE 34 - #define TRUE 1 35 - #endif 36 - #ifndef FALSE 37 - #define FALSE 0 38 - #endif 39 - 40 - struct Scsi_Host; 41 - struct scsi_cmnd; 42 - struct scsi_device; 43 - struct scsi_target; 44 - struct scatterlist; 45 - 46 - #endif /* _SCSI_H */
+6 -2
drivers/scsi/sg.c
··· 49 49 #include <linux/uio.h> 50 50 #include <linux/cred.h> /* for sg_check_file_access() */ 51 51 52 - #include "scsi.h" 52 + #include <scsi/scsi.h> 53 + #include <scsi/scsi_cmnd.h> 53 54 #include <scsi/scsi_dbg.h> 54 - #include <scsi/scsi_host.h> 55 + #include <scsi/scsi_device.h> 55 56 #include <scsi/scsi_driver.h> 57 + #include <scsi/scsi_eh.h> 58 + #include <scsi/scsi_host.h> 56 59 #include <scsi/scsi_ioctl.h> 60 + #include <scsi/scsi_tcq.h> 57 61 #include <scsi/sg.h> 58 62 59 63 #include "scsi_logging.h"
+5 -1
drivers/scsi/sgiwd93.c
··· 28 28 #include <asm/sgi/ip22.h> 29 29 #include <asm/sgi/wd.h> 30 30 31 - #include "scsi.h" 31 + #include <scsi/scsi.h> 32 + #include <scsi/scsi_cmnd.h> 33 + #include <scsi/scsi_device.h> 34 + #include <scsi/scsi_eh.h> 35 + #include <scsi/scsi_tcq.h> 32 36 #include "wd33c93.h" 33 37 34 38 struct ip22_hostdata {
+6 -2
drivers/usb/image/microtek.c
··· 130 130 #include <linux/spinlock.h> 131 131 #include <linux/usb.h> 132 132 #include <linux/proc_fs.h> 133 - 134 133 #include <linux/atomic.h> 135 134 #include <linux/blkdev.h> 136 - #include "../../scsi/scsi.h" 135 + 136 + #include <scsi/scsi.h> 137 + #include <scsi/scsi_cmnd.h> 138 + #include <scsi/scsi_device.h> 139 + #include <scsi/scsi_eh.h> 137 140 #include <scsi/scsi_host.h> 141 + #include <scsi/scsi_tcq.h> 138 142 139 143 #include "microtek.h" 140 144
-1
drivers/usb/storage/debug.c
··· 36 36 37 37 #include "usb.h" 38 38 #include "debug.h" 39 - #include "scsi.h" 40 39 41 40 42 41 void usb_stor_show_command(const struct us_data *us, struct scsi_cmnd *srb)