OSDN Git Service

phy: ti-pipe3: Remove unneeded ifdef CONFIG_OF guard and of_match_ptr
authorAxel Lin <axel.lin@ingics.com>
Thu, 5 Mar 2015 10:20:53 +0000 (18:20 +0800)
committerKishon Vijay Abraham I <kishon@ti.com>
Tue, 10 Mar 2015 08:42:28 +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-ti-pipe3.c

index 95c88f9..ad3fbc8 100644 (file)
@@ -291,9 +291,7 @@ static struct phy_ops ops = {
        .owner          = THIS_MODULE,
 };
 
-#ifdef CONFIG_OF
 static const struct of_device_id ti_pipe3_id_table[];
-#endif
 
 static int ti_pipe3_probe(struct platform_device *pdev)
 {
@@ -315,8 +313,7 @@ static int ti_pipe3_probe(struct platform_device *pdev)
        spin_lock_init(&phy->lock);
 
        if (!of_device_is_compatible(node, "ti,phy-pipe3-pcie")) {
-               match = of_match_device(of_match_ptr(ti_pipe3_id_table),
-                                       &pdev->dev);
+               match = of_match_device(ti_pipe3_id_table, &pdev->dev);
                if (!match)
                        return -EINVAL;
 
@@ -574,7 +571,6 @@ static const struct dev_pm_ops ti_pipe3_pm_ops = {
        SET_SYSTEM_SLEEP_PM_OPS(ti_pipe3_suspend, ti_pipe3_resume)
 };
 
-#ifdef CONFIG_OF
 static const struct of_device_id ti_pipe3_id_table[] = {
        {
                .compatible = "ti,phy-usb3",
@@ -594,7 +590,6 @@ static const struct of_device_id ti_pipe3_id_table[] = {
        {}
 };
 MODULE_DEVICE_TABLE(of, ti_pipe3_id_table);
-#endif
 
 static struct platform_driver ti_pipe3_driver = {
        .probe          = ti_pipe3_probe,
@@ -602,7 +597,7 @@ static struct platform_driver ti_pipe3_driver = {
        .driver         = {
                .name   = "ti-pipe3",
                .pm     = &ti_pipe3_pm_ops,
-               .of_match_table = of_match_ptr(ti_pipe3_id_table),
+               .of_match_table = ti_pipe3_id_table,
        },
 };