Re: [PATCH v2 03/44] scsi: Remove drivers/scsi/scsi.h

[John Garry <john.garry@xxxxxxxxxx>]

On 08/02/2022 17:24, Bart Van Assche wrote:
> -#include "scsi.h"
> +#include <scsi/scsi.h>
> +#include <scsi/scsi.h>

<scsi/scsi.h> seems to be included twice

> +#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 "scsi.h"
> +#include <scsi/scsi.h>
> +#include <scsi/scsi.h>

And here

> +#include <scsi/scsi_cmnd.h>
> +#include <scsi/scsi_device.h>

Thanks,
John