usb: phy: omap-control: Get rid of platform data

omap-control device is present from OMAP4 onwards which
support device tree boots only. So get rid of platform data.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/phy/phy-omap-control.c b/drivers/usb/phy/phy-omap-control.c
index a4dda8e..9772592 100644 (file)
--- 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;
 

diff --git a/include/linux/usb/omap_control_usb.h b/include/linux/usb/omap_control_usb.h
index 27b5b8c..e2416b4 100644 (file)
--- a/include/linux/usb/omap_control_usb.h
+++ b/include/linux/usb/omap_control_usb.h
@@ -31,10 +31,6 @@ struct omap_control_usb {
        u32 type;
 };
 
-struct omap_control_usb_platform_data {
-       u8 type;
-};
-
 enum omap_control_usb_mode {
        USB_MODE_UNDEFINED = 0,
        USB_MODE_HOST,