Merge branch 'core/urgent' into locking/urgent, to collect all pending locking fixes

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinctrl-tegra-xusb.c

diff --git a/drivers/pinctrl/pinctrl-tegra-xusb.c b/drivers/pinctrl/pinctrl-tegra-xusb.c
index 080ec7723ef2e4319810bef820a9578a25895557..753d747d4261142541a1874beadcd8eb06ccf3dd 100644 (file)
--- a/drivers/pinctrl/pinctrl-tegra-xusb.c
+++ b/drivers/pinctrl/pinctrl-tegra-xusb.c
@@ -915,7 +915,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)
                goto reset;
        }
 
-       phy = devm_phy_create(&pdev->dev, NULL, &pcie_phy_ops, NULL);
+       phy = devm_phy_create(&pdev->dev, NULL, &pcie_phy_ops);
        if (IS_ERR(phy)) {
                err = PTR_ERR(phy);
                goto unregister;
@@ -924,7 +924,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev)
        padctl->phys[TEGRA_XUSB_PADCTL_PCIE] = phy;
        phy_set_drvdata(phy, padctl);
 
-       phy = devm_phy_create(&pdev->dev, NULL, &sata_phy_ops, NULL);
+       phy = devm_phy_create(&pdev->dev, NULL, &sata_phy_ops);
        if (IS_ERR(phy)) {
                err = PTR_ERR(phy);
                goto unregister;