openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: phy: tegra: Use devm_otg_ulpi_create() 

The resource-managed variant removes the necessity for the driver to care
about freeing ULPI resources.

Suggested-by: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20200106013416.9604-12-digetx@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dmitry Osipenko 2020-01-06 04:34:07 +03:00 committed by Greg Kroah-Hartman
parent dea75ee6c9
commit 875417471e
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/usb/phy/phy-tegra-usb.c
View File

@ -1100,6 +1100,7 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
enum usb_phy_interface phy_type; enum usb_phy_interface phy_type;
struct reset_control *reset; struct reset_control *reset;
struct resource *res; struct resource *res;
struct usb_phy *phy;
int err; int err;
tegra_phy = devm_kzalloc(&pdev->dev, sizeof(*tegra_phy), GFP_KERNEL); tegra_phy = devm_kzalloc(&pdev->dev, sizeof(*tegra_phy), GFP_KERNEL);
@ -1200,12 +1201,14 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
return err; return err;
} }
tegra_phy->ulpi = otg_ulpi_create(&ulpi_viewport_access_ops, 0); phy = devm_otg_ulpi_create(&pdev->dev,
if (!tegra_phy->ulpi) { &ulpi_viewport_access_ops, 0);
if (!phy) {
dev_err(&pdev->dev, "Failed to create ULPI OTG\n"); dev_err(&pdev->dev, "Failed to create ULPI OTG\n");
return -ENOMEM; return -ENOMEM;
} }
tegra_phy->ulpi = phy;
tegra_phy->ulpi->io_priv = tegra_phy->regs + ULPI_VIEWPORT; tegra_phy->ulpi->io_priv = tegra_phy->regs + ULPI_VIEWPORT;
break; break;
@ -1224,17 +1227,9 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
err = usb_add_phy_dev(&tegra_phy->u_phy); err = usb_add_phy_dev(&tegra_phy->u_phy);
if (err) if (err)
goto free_ulpi; return err;
return 0; return 0;
free_ulpi:
if (tegra_phy->ulpi) {
kfree(tegra_phy->ulpi->otg);
kfree(tegra_phy->ulpi);
}
return err;
} }
static int tegra_usb_phy_remove(struct platform_device *pdev) static int tegra_usb_phy_remove(struct platform_device *pdev)
@ -1243,11 +1238,6 @@ static int tegra_usb_phy_remove(struct platform_device *pdev)
usb_remove_phy(&tegra_phy->u_phy); usb_remove_phy(&tegra_phy->u_phy);
if (tegra_phy->ulpi) {
kfree(tegra_phy->ulpi->otg);
kfree(tegra_phy->ulpi);
}
return 0; return 0;
} }