musb fixes for v5.5-rc3
Bin Liu
maintainercover musb fixes for v5.5-rc3
Hi Greg,
Here are couple patches for musb fixes for v5.5 -rc. Please let me know if any change is needed.
Regards,
-Bin.
---
Paul Cercueil (2):
usb: musb: dma: Correct parameter passed to IRQ handler
usb: musb: jz4740: Silence error if code is -EPROBE_DEFER
drivers/usb/musb/jz4740.c | 7 +++++-- drivers/usb/musb/musbhsdma.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-)
Signature · 1 line
2.17.1
Bin Liu
maintainerPATCH 1/2 usb: musb: dma: Correct parameter passed to IRQ handler
From: Paul Cercueil <[email protected]>
The IRQ handler was passed a pointer to a struct dma_controller, but the argument was then casted to a pointer to a struct musb_dma_controller.
--- drivers/usb/musb/musbhsdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/musb/musbhsdma.c +1 -1
@@ -425,7 +425,7 @@ struct dma_controller *musbhs_dma_controller_create(struct musb *musb, controller->controller.channel_abort = dma_channel_abort;if (request_irq (irq, dma_controller_irq,0 , -dev_name (musb->controller), &controller->controller)) { +dev_name (musb->controller), controller)) {dev_err (dev,"request_irq %d failed!\n" , irq);musb_dma_controller_destroy (&controller->controller);
Signature · 1 line
2.17.1
Bin Liu
maintainerPATCH 2/2 usb: musb: jz4740: Silence error if code is -EPROBE_DEFER
In reply to Bin LiuFrom: Paul Cercueil <[email protected]>
Avoid printing any error message if the error code is -EPROBE_DEFER.
--- drivers/usb/musb/jz4740.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/usb/musb/jz4740.c +5 -2
@@ -75,14 +75,17 @@ static struct musb_hdrc_platform_data jz4740_musb_platform_data = {static int jz4740_musb_init (struct musb *musb) {struct device *dev = musb->controller->parent; +int err;if (dev->of_node) musb->xceiv =devm_usb_get_phy_by_phandle (dev,"phys" ,0 );else musb->xceiv =devm_usb_get_phy (dev,USB_PHY_TYPE_USB2 );if (IS_ERR (musb->xceiv)) { -dev_err (dev,"No transceiver configured\n" ); -return PTR_ERR (musb->xceiv); + err =PTR_ERR (musb->xceiv); +if (err != -EPROBE_DEFER ) +dev_err (dev,"No transceiver configured: %d" , err); +return err; }/* Silicon does not implement ConfigData register.
Signature · 1 line
2.17.1
Bin Liu
maintainerPATCH v2 2/2 usb: musb: jz4740: Silence error if code is -EPROBE_DEFER
From: Paul Cercueil <[email protected]>
Avoid printing any error message if the error code is -EPROBE_DEFER.
---
v2: add signed-off
drivers/usb/musb/jz4740.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/usb/musb/jz4740.c +5 -2
@@ -75,14 +75,17 @@ static struct musb_hdrc_platform_data jz4740_musb_platform_data = {static int jz4740_musb_init (struct musb *musb) {struct device *dev = musb->controller->parent; +int err;if (dev->of_node) musb->xceiv =devm_usb_get_phy_by_phandle (dev,"phys" ,0 );else musb->xceiv =devm_usb_get_phy (dev,USB_PHY_TYPE_USB2 );if (IS_ERR (musb->xceiv)) { -dev_err (dev,"No transceiver configured\n" ); -return PTR_ERR (musb->xceiv); + err =PTR_ERR (musb->xceiv); +if (err != -EPROBE_DEFER ) +dev_err (dev,"No transceiver configured: %d" , err); +return err; }/* Silicon does not implement ConfigData register.
Signature · 1 line
2.17.1