Commit cdefb765 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Lee Jones
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 5783bbe9

drivers/mfd/sec-core.c

+3 −7
Original line number Diff line number Diff line
@@ -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;

}