drm/amdgpu: disable GFX CGCG in aldebaran

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

diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 68d8f2b..2141de7 100644 (file)
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -11,6 +11,7 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/of_irq.h>
 #include <linux/interrupt.h>
 #include <linux/pm_runtime.h>
@@ -145,11 +146,9 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
 static inline unsigned long max8997_i2c_get_driver_data(struct i2c_client *i2c,
                                                const struct i2c_device_id *id)
 {
-       if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {
-               const struct of_device_id *match;
-               match = of_match_node(max8997_pmic_dt_match, i2c->dev.of_node);
-               return (unsigned long)match->data;
-       }
+       if (i2c->dev.of_node)
+               return (unsigned long)of_device_get_match_data(&i2c->dev);
+
        return id->driver_data;
 }