summaryrefslogtreecommitdiffstats
path: root/drivers/usb/phy/phy-omap-control.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/phy/phy-omap-control.c')
-rw-r--r--drivers/usb/phy/phy-omap-control.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/usb/phy/phy-omap-control.c b/drivers/usb/phy/phy-omap-control.c
index a4dda8e1256..977259252a8 100644
--- a/drivers/usb/phy/phy-omap-control.c
+++ b/drivers/usb/phy/phy-omap-control.c
@@ -197,8 +197,6 @@ static int omap_control_usb_probe(struct platform_device *pdev)
{
struct resource *res;
struct device_node *np = pdev->dev.of_node;
- struct omap_control_usb_platform_data *pdata =
- dev_get_platdata(&pdev->dev);
control_usb = devm_kzalloc(&pdev->dev, sizeof(*control_usb),
GFP_KERNEL);
@@ -207,14 +205,10 @@ static int omap_control_usb_probe(struct platform_device *pdev)
return -ENOMEM;
}
- if (np) {
+ if (np)
of_property_read_u32(np, "ti,type", &control_usb->type);
- } else if (pdata) {
- control_usb->type = pdata->type;
- } else {
- dev_err(&pdev->dev, "no pdata present\n");
- return -EINVAL;
- }
+ else
+ return -EINVAL; /* We only support DT boot */
control_usb->dev = &pdev->dev;