diff options
| author |   Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> | 2021-05-26 08:47:03 -0400 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2021-06-02 10:51:18 +0100 |
| commit | cdefb765f150174ba9dec5775da07175d6f8c4e7 (patch) | |
| tree | d1400f5eb52e05bd074de415a76db6067b93194d /drivers/mfd | |
| parent | mfd: da9062: Simplify getting of_device_id match data (diff) | |
| download | linux-dev-cdefb765f150174ba9dec5775da07175d6f8c4e7.tar.xz linux-dev-cdefb765f150174ba9dec5775da07175d6f8c4e7.zip | |
mfd: sec: 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>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/sec-core.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index 8d55992da19e..15dd4c579937 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c @@ -10,6 +10,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> @@ -323,14 +324,9 @@ sec_pmic_i2c_parse_dt_pdata(struct device *dev) static inline unsigned long sec_i2c_get_driver_data(struct i2c_client *i2c, const struct i2c_device_id *id) { -#ifdef CONFIG_OF - if (i2c->dev.of_node) { - const struct of_device_id *match; + if (i2c->dev.of_node) + return (unsigned long)of_device_get_match_data(&i2c->dev); - match = of_match_node(sec_dt_match, i2c->dev.of_node); - return (unsigned long)match->data; - } -#endif return id->driver_data; } |