diff options
| author | Greg Kroah-Hartman <[email protected]> | 2016-11-28 08:44:54 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2016-11-28 08:44:54 +0100 |
| commit | cdefb95bfc0de9a60b91b748f15e65eddb4f116e (patch) | |
| tree | 0d5ae76297cbe07a709cf773155ec982e16ac855 /drivers/phy/phy-ti-pipe3.c | |
| parent | 0edbf9e55295585bbe9df61b646ca5bf80a8e1eb (diff) | |
| parent | 5e253dfbdbea97ab3f462cdd75a6d1cae2292901 (diff) | |
Merge tag 'phy-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-next
Kishon writes:
phy: for 4.10
Merge contains:
*) Add new usb2 phy driver for Meson8b and GXBB
*) Remove phy drivers added for miphy365 and STiH415/6 (as support for
these SoCs are removed from the kernel)
*) Add a sysfs entry to facilitate usb role swap in rcar SoC
*) Add support for otg port in rk3399
*) misc fixes in various phy drivers and cleanups
Signed-off-by: Kishon Vijay Abraham I <[email protected]>
Diffstat (limited to 'drivers/phy/phy-ti-pipe3.c')
| -rw-r--r-- | drivers/phy/phy-ti-pipe3.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/phy/phy-ti-pipe3.c b/drivers/phy/phy-ti-pipe3.c index bf46844dc387..9c84d32c6f60 100644 --- a/drivers/phy/phy-ti-pipe3.c +++ b/drivers/phy/phy-ti-pipe3.c @@ -537,10 +537,7 @@ static int ti_pipe3_get_pll_base(struct ti_pipe3 *phy) res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pll_ctrl"); phy->pll_ctrl_base = devm_ioremap_resource(dev, res); - if (IS_ERR(phy->pll_ctrl_base)) - return PTR_ERR(phy->pll_ctrl_base); - - return 0; + return PTR_ERR_OR_ZERO(phy->pll_ctrl_base); } static int ti_pipe3_probe(struct platform_device *pdev) @@ -592,10 +589,7 @@ static int ti_pipe3_probe(struct platform_device *pdev) ti_pipe3_power_off(generic_phy); phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); - if (IS_ERR(phy_provider)) - return PTR_ERR(phy_provider); - - return 0; + return PTR_ERR_OR_ZERO(phy_provider); } static int ti_pipe3_remove(struct platform_device *pdev) |