USB: gadget: stop propagating controller OF nodes
Subsystems (7)
PATCH 1/1 USB: gadget: stop propagating controller OF nodes
Some UDC drivers propagate the controller OF node to the gadget device but there are no (and has never been any) users of this as the devicetree binding and composite driver support was never merged. [1]
Drop the unused and incomplete support for OF node propagation which if ever needed should be handled by UDC core.
Note that this also avoids probe failures when reusing an OF node that describe resources like pinctrl that are managed by driver core (cf. commit 48ed32482c41 ("usb: gadget: aspeed: Fix probe regression")).
---
This was something I stumbled over when fixing a couple of gadget device name leaks. This one applies on top of those fixes:
https://lore.kernel.org/all/[email protected]/
Johan
drivers/usb/gadget/udc/aspeed-vhub/dev.c | 2 -- drivers/usb/gadget/udc/aspeed_udc.c | 1 - drivers/usb/gadget/udc/at91_udc.c | 1 - drivers/usb/gadget/udc/bcm63xx_udc.c | 1 - drivers/usb/gadget/udc/fsl_udc_core.c | 3 --- drivers/usb/gadget/udc/lpc32xx_udc.c | 1 - 6 files changed, 9 deletions(-)
drivers/usb/gadget/udc/aspeed-vhub/dev.c +0 -2
@@ -592,8 +592,6 @@ int ast_vhub_init_dev(struct ast_vhub *vhub, unsigned int idx)else d->gadget.max_speed =USB_SPEED_HIGH ; d->gadget.speed =USB_SPEED_UNKNOWN ; - d->gadget.dev.of_node = vhub->pdev->dev.of_node; -dev_set_of_node_reused (&d->gadget.dev); rc =usb_add_gadget_udc (d->port_dev, &d->gadget);if (rc !=0 )
drivers/usb/gadget/udc/aspeed_udc.c +0 -1
@@ -1299,7 +1299,6 @@ static int ast_udc_start(struct usb_gadget *gadget,UDC_DBG (udc,"\n" ); udc->driver = driver; - udc->gadget.dev.of_node = udc->pdev->dev.of_node;for (i =0 ; i <AST_UDC_NUM_ENDPOINTS ; i++) { ep = &udc->ep[i];
drivers/usb/gadget/udc/at91_udc.c +0 -1
@@ -1558,7 +1558,6 @@ static int at91_start(struct usb_gadget *gadget, udc = container_of(gadget, struct at91_udc, gadget); udc->driver = driver; - udc->gadget.dev.of_node = udc->pdev->dev.of_node; udc->enabled =1 ; udc->gadget.is_selfpowered =1 ;
drivers/usb/gadget/udc/bcm63xx_udc.c +0 -1
@@ -1830,7 +1830,6 @@ static int bcm63xx_udc_start(struct usb_gadget *gadget,bcm63xx_select_phy_mode (udc, true); udc->driver = driver; - udc->gadget.dev.of_node = udc->dev->of_node;spin_unlock_irqrestore (&udc->lock, flags);
drivers/usb/gadget/udc/fsl_udc_core.c +0 -3
@@ -2465,9 +2465,6 @@ static int fsl_udc_probe(struct platform_device *pdev) udc_controller->gadget.speed =USB_SPEED_UNKNOWN ; udc_controller->gadget.name = driver_name; -/* Setup gadget.dev and register with kernel */ - udc_controller->gadget.dev.of_node = pdev->dev.of_node; -if (!IS_ERR_OR_NULL (udc_controller->transceiver)) udc_controller->gadget.is_otg =1 ;
drivers/usb/gadget/udc/lpc32xx_udc.c +0 -1
@@ -2889,7 +2889,6 @@ static int lpc32xx_start(struct usb_gadget *gadget, } udc->driver = driver; - udc->gadget.dev.of_node = udc->dev->of_node; udc->enabled =1 ; udc->gadget.is_selfpowered =1 ; udc->vbus =0 ;
Signature · 1 line
2.53.0
Quoted 11 lines · Johan Hovold
Some UDC drivers propagate the controller OF node to the gadget device but there are no (and has never been any) users of this as the devicetree binding and composite driver support was never merged. [1]
Drop the unused and incomplete support for OF node propagation which if ever needed should be handled by UDC core.
Note that this also avoids probe failures when reusing an OF node that describe resources like pinctrl that are managed by driver core (cf. commit
48ed32482c41("usb: gadget: aspeed: Fix probe regression")).
Quoted 8 lines
Signed-off-by Johan Hovold <[email protected]>---
This was something I stumbled over when fixing a couple of gadget device name leaks. This one applies on top of those fixes:
https://lore.kernel.org/all/[email protected]/
These fixes are now in 7.2-rc5 (and usb-next) so can this one be picked up for 7.3?
Let me know if you prefer a resend.
Quoted 7 lines
drivers/usb/gadget/udc/aspeed-vhub/dev.c | 2 -- drivers/usb/gadget/udc/aspeed_udc.c | 1 - drivers/usb/gadget/udc/at91_udc.c | 1 - drivers/usb/gadget/udc/bcm63xx_udc.c | 1 - drivers/usb/gadget/udc/fsl_udc_core.c | 3 --- drivers/usb/gadget/udc/lpc32xx_udc.c | 1 - 6 files changed, 9 deletions(-)
Johan
Greg Kroah-Hartman
maintainerQuoted 16 lines · Johan Hovold
Quoted 15 lines · Johan Hovold
Some UDC drivers propagate the controller OF node to the gadget device but there are no (and has never been any) users of this as the devicetree binding and composite driver support was never merged. [1]
Drop the unused and incomplete support for OF node propagation which if ever needed should be handled by UDC core.
Note that this also avoids probe failures when reusing an OF node that describe resources like pinctrl that are managed by driver core (cf. commit
48ed32482c41("usb: gadget: aspeed: Fix probe regression")).Signed-off-by Johan Hovold <[email protected]>---
Quoted 7 lines
Quoted 4 lines
This was something I stumbled over when fixing a couple of gadget device name leaks. This one applies on top of those fixes:
https://lore.kernel.org/all/[email protected]/These fixes are now in 7.2-rc5 (and usb-next) so can this one be picked up for 7.3?
I'll take it now, thanks.
greg k-h