Message ID | 20200309130014.548168-2-lkundrak@v3.sk (mailing list archive) |
---|---|
State | Mainlined |
Commit | aed67922031377b83a5dc3afa1e207152069100e |
Headers | show |
Series | [1/2] USB: EHCI: ehci-mv: switch the HSIC HCI to HSIC mode | expand |
On Mon, 9 Mar 2020, Lubomir Rintel wrote: > In case there are multiple Marvell EHCI blocks in system, we need a > different bus name for each one. Otherwise debugfs gets mildly upset about > a directory name in usb/ehci: > > debugfs: Directory 'mv ehci' with parent 'ehci' already present! > > Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Acked-by: Alan Stern <stern@rowland.harvard.edu> > --- > drivers/usb/host/ehci-mv.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c > index ddb668963955f..1300c457d9ed6 100644 > --- a/drivers/usb/host/ehci-mv.c > +++ b/drivers/usb/host/ehci-mv.c > @@ -115,7 +115,7 @@ static int mv_ehci_probe(struct platform_device *pdev) > if (usb_disabled()) > return -ENODEV; > > - hcd = usb_create_hcd(&ehci_platform_hc_driver, &pdev->dev, "mv ehci"); > + hcd = usb_create_hcd(&ehci_platform_hc_driver, &pdev->dev, dev_name(&pdev->dev)); > if (!hcd) > return -ENOMEM; > >
diff --git a/drivers/usb/host/ehci-mv.c b/drivers/usb/host/ehci-mv.c index ddb668963955f..1300c457d9ed6 100644 --- a/drivers/usb/host/ehci-mv.c +++ b/drivers/usb/host/ehci-mv.c @@ -115,7 +115,7 @@ static int mv_ehci_probe(struct platform_device *pdev) if (usb_disabled()) return -ENODEV; - hcd = usb_create_hcd(&ehci_platform_hc_driver, &pdev->dev, "mv ehci"); + hcd = usb_create_hcd(&ehci_platform_hc_driver, &pdev->dev, dev_name(&pdev->dev)); if (!hcd) return -ENOMEM;
In case there are multiple Marvell EHCI blocks in system, we need a different bus name for each one. Otherwise debugfs gets mildly upset about a directory name in usb/ehci: debugfs: Directory 'mv ehci' with parent 'ehci' already present! Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> --- drivers/usb/host/ehci-mv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)