diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2022-02-18 22:50:34 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2022-02-23 05:11:02 +0300 |
| commit | 53555fb7bceb14f5fdb9358290daf64d0ea0f56a (patch) | |
| tree | b060a1eb77b2a7beeb537dc6afc22a04d46b55fa /drivers/usb | |
| parent | dfab1e53eef4506e5aec1a32650bffc2c6ac4a37 (diff) | |
| download | linux-53555fb7bceb14f5fdb9358290daf64d0ea0f56a.tar.xz | |
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>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/image/microtek.c | 8 | ||||
| -rw-r--r-- | drivers/usb/storage/debug.c | 1 |
2 files changed, 6 insertions, 3 deletions
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) |