diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-05-29 02:30:49 -0400 |
---|---|---|
committer | Kishon Vijay Abraham I <kishon@ti.com> | 2014-07-22 03:16:09 -0400 |
commit | 2d84aff9c395d770bfe4d3fb6d1749882be7e4cc (patch) | |
tree | fae73e0c63af4e54a7d3015517290505238ed33f /drivers/phy | |
parent | 22fda307ca53f18a179c38ac10a0bc4293dd9f21 (diff) |
phy: sun4i-usb: Use PTR_ERR_OR_ZERO
PTR_ERR_OR_ZERO simplifies the code.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy')
-rw-r--r-- | drivers/phy/phy-sun4i-usb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c index 115d8d5190d5..7a4ea552f621 100644 --- a/drivers/phy/phy-sun4i-usb.c +++ b/drivers/phy/phy-sun4i-usb.c | |||
@@ -22,6 +22,7 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
25 | #include <linux/err.h> | ||
25 | #include <linux/io.h> | 26 | #include <linux/io.h> |
26 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
27 | #include <linux/module.h> | 28 | #include <linux/module.h> |
@@ -306,10 +307,8 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev) | |||
306 | 307 | ||
307 | dev_set_drvdata(dev, data); | 308 | dev_set_drvdata(dev, data); |
308 | phy_provider = devm_of_phy_provider_register(dev, sun4i_usb_phy_xlate); | 309 | phy_provider = devm_of_phy_provider_register(dev, sun4i_usb_phy_xlate); |
309 | if (IS_ERR(phy_provider)) | ||
310 | return PTR_ERR(phy_provider); | ||
311 | 310 | ||
312 | return 0; | 311 | return PTR_ERR_OR_ZERO(phy_provider); |
313 | } | 312 | } |
314 | 313 | ||
315 | static const struct of_device_id sun4i_usb_phy_of_match[] = { | 314 | static const struct of_device_id sun4i_usb_phy_of_match[] = { |