| Message ID | Z-R9BcnSzrRv5FX_@kspp (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [next] usb: ehci-fsl: Avoid -Wflex-array-member-not-at-end warning | expand |
On Wed, Mar 26, 2025 at 04:17:41PM -0600, Gustavo A. R. Silva wrote: > -Wflex-array-member-not-at-end was introduced in GCC-14, and we are > getting ready to enable it, globally. > > Move the conflicting declaration to the end of the structure. Notice > that `struct ehci_hcd` is a flexible structure --a structure that > contains a flexible-array member. > > Fix the following warning: > > drivers/usb/host/ehci-fsl.c:414:25: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] > > Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> > --- > drivers/usb/host/ehci-fsl.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c > index 26f13278d4d6..c720d55f4982 100644 > --- a/drivers/usb/host/ehci-fsl.c > +++ b/drivers/usb/host/ehci-fsl.c > @@ -411,12 +411,13 @@ static int ehci_fsl_setup(struct usb_hcd *hcd) > } > > struct ehci_fsl { > - struct ehci_hcd ehci; > - > #ifdef CONFIG_PM > /* Saved USB PHY settings, need to restore after deep sleep. */ > u32 usb_ctrl; > #endif > + > + /* Must be last --ends in a flexible-array member. */ > + struct ehci_hcd ehci; > }; > > #ifdef CONFIG_PM While the sentiment is laudable, this mechanical change simply will not work. The driver was written incorrectly to begin with, and the change will probably break it. I'll try to find time soon to create a proper fix. In short, the usb_ctrl field should have been stored in the .priv flex member of the ehci_hcd structure all along, and the .extra_priv_size member of ehci_fsl_overrides should have been set to the size of this u32 field, not the size of the entire ehci_fsl structure. Alan Stern
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 26f13278d4d6..c720d55f4982 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -411,12 +411,13 @@ static int ehci_fsl_setup(struct usb_hcd *hcd) } struct ehci_fsl { - struct ehci_hcd ehci; - #ifdef CONFIG_PM /* Saved USB PHY settings, need to restore after deep sleep. */ u32 usb_ctrl; #endif + + /* Must be last --ends in a flexible-array member. */ + struct ehci_hcd ehci; }; #ifdef CONFIG_PM
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally. Move the conflicting declaration to the end of the structure. Notice that `struct ehci_hcd` is a flexible structure --a structure that contains a flexible-array member. Fix the following warning: drivers/usb/host/ehci-fsl.c:414:25: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> --- drivers/usb/host/ehci-fsl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)