phy: omap-usb2: Remove unneeded ifdef CONFIG_OF guard and of_match_ptr
authorAxel Lin <axel.lin@ingics.com>
Thu, 5 Mar 2015 10:20:07 +0000 (18:20 +0800)
committerKishon Vijay Abraham I <kishon@ti.com>
Tue, 10 Mar 2015 08:42:27 +0000 (14:12 +0530)
if !CONFIG_OF, the probe fails.
This is a dt-only driver, so the ifdef CONFIG_OF guard and of_match_ptr are
not needed.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
drivers/phy/phy-omap-usb2.c

index 6f4aef3..18b33ce 100644 (file)
@@ -144,7 +144,6 @@ static struct phy_ops ops = {
        .owner          = THIS_MODULE,
 };
 
-#ifdef CONFIG_OF
 static const struct usb_phy_data omap_usb2_data = {
        .label = "omap_usb2",
        .flags = OMAP_USB2_HAS_START_SRP | OMAP_USB2_HAS_SET_VBUS,
@@ -185,7 +184,6 @@ static const struct of_device_id omap_usb2_id_table[] = {
        {},
 };
 MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
-#endif
 
 static int omap_usb2_probe(struct platform_device *pdev)
 {
@@ -200,7 +198,7 @@ static int omap_usb2_probe(struct platform_device *pdev)
        const struct of_device_id *of_id;
        struct usb_phy_data *phy_data;
 
-       of_id = of_match_device(of_match_ptr(omap_usb2_id_table), &pdev->dev);
+       of_id = of_match_device(omap_usb2_id_table, &pdev->dev);
 
        if (!of_id)
                return -EINVAL;
@@ -377,7 +375,7 @@ static struct platform_driver omap_usb2_driver = {
        .driver         = {
                .name   = "omap-usb2",
                .pm     = DEV_PM_OPS,
-               .of_match_table = of_match_ptr(omap_usb2_id_table),
+               .of_match_table = omap_usb2_id_table,
        },
 };