Message ID | 20220128221909.8141-7-bvanassche@acm.org |
---|---|
State | Superseded |
Headers | show |
Series | Remove the SCSI pointer from struct scsi_cmnd | expand |
Looks good,
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c index a8a72d822862..38aa9333631b 100644 --- a/drivers/scsi/arm/acornscsi.c +++ b/drivers/scsi/arm/acornscsi.c @@ -136,7 +136,7 @@ #include <scsi/scsi_transport_spi.h> #include "acornscsi.h" #include "msgqueue.h" -#include "scsi.h" +#include "arm_scsi.h" #include <scsi/scsicam.h> diff --git a/drivers/scsi/arm/scsi.h b/drivers/scsi/arm/arm_scsi.h similarity index 97% rename from drivers/scsi/arm/scsi.h rename to drivers/scsi/arm/arm_scsi.h index 4d5ff7b4e864..3eb5c6aa93c9 100644 --- a/drivers/scsi/arm/scsi.h +++ b/drivers/scsi/arm/arm_scsi.h @@ -1,10 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * linux/drivers/acorn/scsi/scsi.h - * * Copyright (C) 2002 Russell King * - * Commonly used scsi driver functions. + * Commonly used functions by the ARM SCSI-II drivers. */ #include <linux/scatterlist.h> diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c index 536d6646e40b..d15053f02472 100644 --- a/drivers/scsi/arm/cumana_2.c +++ b/drivers/scsi/arm/cumana_2.c @@ -36,7 +36,7 @@ #include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> #include "fas216.h" -#include "scsi.h" +#include "arm_scsi.h" #include <scsi/scsicam.h> diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c index ab0f6422a6a9..6f374af9f45f 100644 --- a/drivers/scsi/arm/eesox.c +++ b/drivers/scsi/arm/eesox.c @@ -42,7 +42,7 @@ #include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> #include "fas216.h" -#include "scsi.h" +#include "arm_scsi.h" #include <scsi/scsicam.h> diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c index 0d6df5ebf934..a23e34c9f7de 100644 --- a/drivers/scsi/arm/fas216.c +++ b/drivers/scsi/arm/fas216.c @@ -55,7 +55,7 @@ #include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> #include "fas216.h" -#include "scsi.h" +#include "arm_scsi.h" /* NOTE: SCSI2 Synchronous transfers *require* DMA according to * the data sheet. This restriction is crazy, especially when diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c index 797568b271e3..7586d2a03812 100644 --- a/drivers/scsi/arm/powertec.c +++ b/drivers/scsi/arm/powertec.c @@ -27,7 +27,7 @@ #include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> #include "fas216.h" -#include "scsi.h" +#include "arm_scsi.h" #include <scsi/scsicam.h>
The new name makes the purpose of this header file more clear and also makes it easier to find this header file with grep. Cc: Russell King <linux@armlinux.org.uk> Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/scsi/arm/acornscsi.c | 2 +- drivers/scsi/arm/{scsi.h => arm_scsi.h} | 4 +--- drivers/scsi/arm/cumana_2.c | 2 +- drivers/scsi/arm/eesox.c | 2 +- drivers/scsi/arm/fas216.c | 2 +- drivers/scsi/arm/powertec.c | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) rename drivers/scsi/arm/{scsi.h => arm_scsi.h} (97%)