Revert "phy: merge and backport phy core from linux kernel 4.1"

[firefly-linux-kernel-4.4.55.git] / drivers / phy / phy-hix5hd2-sata.c

diff --git a/drivers/phy/phy-hix5hd2-sata.c b/drivers/phy/phy-hix5hd2-sata.c
index 34915b4202f18c5249a059dd42aa914fee2e7f2d..d5d978085c6d43e5220c5f0756930719e6c79313 100644 (file)
--- a/drivers/phy/phy-hix5hd2-sata.c
+++ b/drivers/phy/phy-hix5hd2-sata.c
@@ -156,7 +156,7 @@ static int hix5hd2_sata_phy_probe(struct platform_device *pdev)
        if (IS_ERR(priv->peri_ctrl))
                priv->peri_ctrl = NULL;
 
-       phy = devm_phy_create(dev, NULL, &hix5hd2_sata_phy_ops);
+       phy = devm_phy_create(dev, NULL, &hix5hd2_sata_phy_ops, NULL);
        if (IS_ERR(phy)) {
                dev_err(dev, "failed to create PHY\n");
                return PTR_ERR(phy);
@@ -164,7 +164,10 @@ static int hix5hd2_sata_phy_probe(struct platform_device *pdev)
 
        phy_set_drvdata(phy, priv);
        phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
-       return PTR_ERR_OR_ZERO(phy_provider);
+       if (IS_ERR(phy_provider))
+               return PTR_ERR(phy_provider);
+
+       return 0;
 }
 
 static const struct of_device_id hix5hd2_sata_phy_of_match[] = {