scsi: pm80xx: Avoid -Wflex-array-member-not-at-end warnings

Comment out unused field 'residual_count' in a couple of structures, and
with this, fix the following -Wflex-array-member-not-at-end warnings:

drivers/scsi/pm8001/pm8001_hwi.h:342:33: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
drivers/scsi/pm8001/pm80xx_hwi.h:561:32: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]

Reviewed-by: Jack Wang <jinpu.wang@ionos.com>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/pm8001/pm8001_hwi.h b/drivers/scsi/pm8001/pm8001_hwi.h
index fc2127dcb58d905bf79a6dbd1082bce20757e351..f1ce8df082b0c658359d804119a6f533d1b981a9 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_hwi.h
+++ b/drivers/scsi/pm8001/pm8001_hwi.h
@@ -339,8 +339,10 @@ struct ssp_completion_resp {
        __le32  status;
        __le32  param;
        __le32  ssptag_rescv_rescpad;
+
+       /* Must be last --ends in a flexible-array member. */
        struct ssp_response_iu  ssp_resp_iu;
-       __le32  residual_count;
+       /* __le32  residual_count; */
 } __attribute__((packed, aligned(4)));
 
 

diff --git a/drivers/scsi/pm8001/pm80xx_hwi.h b/drivers/scsi/pm8001/pm80xx_hwi.h
index eb8fd37b20661e3f303a3c69340c9d0adbaae569..d8a63b7fed6a043ec3e61388013d2b6b0734aa06 100644 (file)
--- a/drivers/scsi/pm8001/pm80xx_hwi.h
+++ b/drivers/scsi/pm8001/pm80xx_hwi.h
@@ -558,8 +558,10 @@ struct ssp_completion_resp {
        __le32  status;
        __le32  param;
        __le32  ssptag_rescv_rescpad;
+
+       /* Must be last --ends in a flexible-array member. */
        struct ssp_response_iu ssp_resp_iu;
-       __le32  residual_count;
+       /* __le32  residual_count; */
 } __attribute__((packed, aligned(4)));
 
 #define SSP_RESCV_BIT  0x00010000