[PATCH] scsi: scsi_priv: Remove duplicate declaration

[PATCH] scsi: scsi_priv: Remove duplicate declaration

[Wan Jiabing]

struct request and struct request_queue have been
declared at forward struct declaration.
Remove the duplicate and reorder the forward declaration
to be in alphabetic order.

Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
---
 drivers/scsi/scsi_priv.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 180636d54982..811abc86f6d6 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -6,14 +6,14 @@
 #include <linux/async.h>
 #include <scsi/scsi_device.h>
 
-struct request_queue;
 struct request;
+struct request_queue;
+struct Scsi_Host;
 struct scsi_cmnd;
 struct scsi_device;
-struct scsi_target;
 struct scsi_host_template;
-struct Scsi_Host;
 struct scsi_nl_hdr;
+struct scsi_target;
 
 #define SCSI_CMD_RETRIES_NO_LIMIT -1
 
@@ -96,8 +96,6 @@ extern int scsi_mq_setup_tags(struct Scsi_Host *shost);
 extern void scsi_mq_destroy_tags(struct Scsi_Host *shost);
 extern void scsi_exit_queue(void);
 extern void scsi_evt_thread(struct work_struct *work);
-struct request_queue;
-struct request;
 
 /* scsi_proc.c */
 #ifdef CONFIG_SCSI_PROC_FS
-- 
2.25.1

Re: [PATCH] scsi: scsi_priv: Remove duplicate declaration

[Martin K. Petersen]

On Sat, 27 Mar 2021 11:08:50 +0800, Wan Jiabing wrote:

> struct request and struct request_queue have been
> declared at forward struct declaration.
> Remove the duplicate and reorder the forward declaration
> to be in alphabetic order.

Applied to 5.13/scsi-queue, thanks!

[1/1] scsi: scsi_priv: Remove duplicate declaration
      https://git.kernel.org/mkp/scsi/c/fe515ac82768

-- 
Martin K. Petersen	Oracle Linux Engineering