Merge branch 'acpi-bind'

[karo-tx-linux.git] / drivers / usb / phy / phy-rcar-usb.c

diff --git a/drivers/usb/phy/phy-rcar-usb.c b/drivers/usb/phy/phy-rcar-usb.c
index ae909408958dcb8a9b0efcc2866d19d0cff7571b..33265a5b2cdf8fdca0fc6ba0b7752a6a54ae9c4f 100644 (file)
--- a/drivers/usb/phy/phy-rcar-usb.c
+++ b/drivers/usb/phy/phy-rcar-usb.c
@@ -83,7 +83,7 @@ static int rcar_usb_phy_init(struct usb_phy *phy)
 {
        struct rcar_usb_phy_priv *priv = usb_phy_to_priv(phy);
        struct device *dev = phy->dev;
-       struct rcar_phy_platform_data *pdata = dev->platform_data;
+       struct rcar_phy_platform_data *pdata = dev_get_platdata(dev);
        void __iomem *reg0 = priv->reg0;
        void __iomem *reg1 = priv->reg1;
        static const u8 ovcn_act[] = { OVC0_ACT, OVC1_ACT, OVC2_ACT };
@@ -184,17 +184,12 @@ static int rcar_usb_phy_probe(struct platform_device *pdev)
        void __iomem *reg0, *reg1 = NULL;
        int ret;
 
-       if (!pdev->dev.platform_data) {
+       if (!dev_get_platdata(&pdev->dev)) {
                dev_err(dev, "No platform data\n");
                return -EINVAL;
        }
 
        res0 = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res0) {
-               dev_err(dev, "Not enough platform resources\n");
-               return -EINVAL;
-       }
-
        reg0 = devm_ioremap_resource(dev, res0);
        if (IS_ERR(reg0))
                return PTR_ERR(reg0);