
The following changes since commit 8c56ea5c1e033f16993e5427300399ef848234bb:
Merge branch 'u-boot-stm32_20190827' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2019-08-27 13:19:47 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to fd0637b814cdbc8aa9060f313f6c8e71fb9c5d15:
dwc2: use the nonblock argument in submit_int_msg (2019-08-29 14:07:26 +0200)
---------------------------------------------------------------- Michal Suchanek (5): usb_kdb: only process events successfully received usb: usb_submit_int_msg -> usb_int_msg usb: storage: submit_int_msg -> usb_int_msg usb: Add nonblock argument to submit_int_msg dwc2: use the nonblock argument in submit_int_msg
common/usb.c | 11 +++++++---- common/usb_kbd.c | 11 +++++------ common/usb_storage.c | 4 ++-- drivers/usb/emul/sandbox_keyb.c | 3 ++- drivers/usb/emul/usb-emul-uclass.c | 6 ++++-- drivers/usb/host/dwc2.c | 15 +++++++++------ drivers/usb/host/ehci-hcd.c | 13 ++++++++----- drivers/usb/host/ohci-hcd.c | 4 ++-- drivers/usb/host/r8a66597-hcd.c | 2 +- drivers/usb/host/sl811-hcd.c | 2 +- drivers/usb/host/usb-sandbox.c | 5 +++-- drivers/usb/host/usb-uclass.c | 5 +++-- drivers/usb/host/xhci.c | 13 ++++++++----- drivers/usb/musb-new/musb_uboot.c | 12 +++++++----- include/usb.h | 11 ++++++----- 15 files changed, 68 insertions(+), 49 deletions(-)

On Thu, Aug 29, 2019 at 02:08:05PM +0200, Marek Vasut wrote:
The following changes since commit 8c56ea5c1e033f16993e5427300399ef848234bb:
Merge branch 'u-boot-stm32_20190827' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2019-08-27 13:19:47 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to fd0637b814cdbc8aa9060f313f6c8e71fb9c5d15:
dwc2: use the nonblock argument in submit_int_msg (2019-08-29 14:07:26 +0200)
NAK, this breaks nokia_rx51 and am3517_crane: +(nokia_rx51,am3517_crane) ../drivers/usb/musb/musb_hcd.c:1052:5: error: conflicting types for 'submit_int_msg' +(nokia_rx51,am3517_crane) int submit_int_msg(struct usb_device *dev, unsigned long pipe, +(nokia_rx51,am3517_crane) ^~~~~~~~~~~~~~ +(nokia_rx51,am3517_crane) In file included from ../drivers/usb/musb/musb_hcd.c:11:0: +(nokia_rx51,am3517_crane) ../include/usb.h:186:5: note: previous declaration of 'submit_int_msg' was here +(nokia_rx51,am3517_crane) int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, +(nokia_rx51,am3517_crane) make[2]: *** [../scripts/Makefile.build:279: drivers/usb/musb/musb_hcd.o] Error 1 +(nokia_rx51,am3517_crane) make[1]: *** [Makefile:1598: drivers/usb/musb] Error 2 +(nokia_rx51,am3517_crane) make: *** [Makefile:148: sub-make] Error 2

On 8/31/19 9:40 PM, Tom Rini wrote:
On Thu, Aug 29, 2019 at 02:08:05PM +0200, Marek Vasut wrote:
The following changes since commit 8c56ea5c1e033f16993e5427300399ef848234bb:
Merge branch 'u-boot-stm32_20190827' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm (2019-08-27 13:19:47 -0400)
are available in the Git repository at:
git://git.denx.de/u-boot-usb.git master
for you to fetch changes up to fd0637b814cdbc8aa9060f313f6c8e71fb9c5d15:
dwc2: use the nonblock argument in submit_int_msg (2019-08-29 14:07:26 +0200)
NAK, this breaks nokia_rx51 and am3517_crane: +(nokia_rx51,am3517_crane) ../drivers/usb/musb/musb_hcd.c:1052:5: error: conflicting types for 'submit_int_msg' +(nokia_rx51,am3517_crane) int submit_int_msg(struct usb_device *dev, unsigned long pipe, +(nokia_rx51,am3517_crane) ^~~~~~~~~~~~~~ +(nokia_rx51,am3517_crane) In file included from ../drivers/usb/musb/musb_hcd.c:11:0: +(nokia_rx51,am3517_crane) ../include/usb.h:186:5: note: previous declaration of 'submit_int_msg' was here +(nokia_rx51,am3517_crane) int submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer, +(nokia_rx51,am3517_crane) make[2]: *** [../scripts/Makefile.build:279: drivers/usb/musb/musb_hcd.o] Error 1 +(nokia_rx51,am3517_crane) make[1]: *** [Makefile:1598: drivers/usb/musb] Error 2 +(nokia_rx51,am3517_crane) make: *** [Makefile:148: sub-make] Error 2
Aaargh! I am CCing the author of the patches ...
participants (2)
-
Marek Vasut
-
Tom Rini