mfd: Use device_get_match_data() in a bunch of drivers

[linux-2.6-microblaze.git] / drivers / mfd / twl4030-power.c

diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index e35b0f7..1595e9c 100644 (file)
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -27,8 +27,8 @@
 #include <linux/pm.h>
 #include <linux/mfd/twl.h>
 #include <linux/platform_device.h>
+#include <linux/property.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 
 #include <asm/mach-types.h>
 
@@ -883,7 +883,6 @@ static int twl4030_power_probe(struct platform_device *pdev)
 {
        const struct twl4030_power_data *pdata = dev_get_platdata(&pdev->dev);
        struct device_node *node = pdev->dev.of_node;
-       const struct of_device_id *match;
        int err = 0;
        int err2 = 0;
        u8 val;
@@ -904,10 +903,8 @@ static int twl4030_power_probe(struct platform_device *pdev)
                return err;
        }
 
-       match = of_match_device(of_match_ptr(twl4030_power_of_match),
-                               &pdev->dev);
-       if (match && match->data)
-               pdata = match->data;
+       if (node)
+               pdata = device_get_match_data(&pdev->dev);
 
        if (pdata) {
                err = twl4030_power_configure_scripts(pdata);