| Message ID | 1463403086-25362-5-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Delegated to: | Marek Vasut |
| Headers | show |
On 05/16/2016 02:51 PM, Masahiro Yamada wrote: > If xhci.h is included without include/usb.h, the compiler > complains like follows: > warning: 'struct devrequest' declared inside parameter list > > We have two options to teach the compiler that devrequest is > a structure: > > [1] Declare "struct devrequest;" in xhci.h > > [2] Include <include/usb.h> from xhci.h > > This commit takes [1] because nothing else in xhci.h depends on > include/usb.h. [2] would require the compiler additional header > parsing. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Applied, thanks!
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 2afa386..16dd61a 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1252,6 +1252,8 @@ void xhci_acknowledge_event(struct xhci_ctrl *ctrl); union xhci_trb *xhci_wait_for_event(struct xhci_ctrl *ctrl, trb_type expected); int xhci_bulk_tx(struct usb_device *udev, unsigned long pipe, int length, void *buffer); + +struct devrequest; int xhci_ctrl_tx(struct usb_device *udev, unsigned long pipe, struct devrequest *req, int length, void *buffer); int xhci_check_maxpacket(struct usb_device *udev);
If xhci.h is included without include/usb.h, the compiler complains like follows: warning: 'struct devrequest' declared inside parameter list We have two options to teach the compiler that devrequest is a structure: [1] Declare "struct devrequest;" in xhci.h [2] Include <include/usb.h> from xhci.h This commit takes [1] because nothing else in xhci.h depends on include/usb.h. [2] would require the compiler additional header parsing. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Changes in v2: - Rephrase git-log drivers/usb/host/xhci.h | 2 ++ 1 file changed, 2 insertions(+)