diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> | 2021-05-26 08:46:59 -0400 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2021-06-02 10:51:17 +0100 |
| commit | b486413dd73ac900c6e3a5cda83f2e3f94cd2b2c (patch) | |
| tree | 1c775ea45226ef1938ac0625b4cd55cfdd2973cd | |
| parent | c32d7feba0b5c8a3e2867bb5def86fab986c51d7 (diff) | |
mfd: max8997: Simplify getting of_device_id match data
Use of_device_get_match_data() to make the code slightly smaller. There
is also no need to wrap it in a check for CONFIG_OF, because dev.of_node
will be set only with OF support.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
| -rw-r--r-- | drivers/mfd/max8997.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c index 68d8f2b95287..2141de78115d 100644 --- 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; } |