Commit af7acc3d authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Lee Jones

mfd: axp20x: Use dev->driver->of_match_table in axp20x_match_device()

In axp20x_match_device(), match the of_device_id table bound to the
device driver instead of pointing to axp20x_of_match directly. This
will allow us to keep axp20x_match_device() unmodified when we expand
the axp20x driver into multiple ones covering different interface
types.

of_device_get_match_data() cannot be used here as we need to know if
it failed to get a match, or if the match data value just happened to
be 0, as it is for the AXP152.
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent e47a3cf7
...@@ -613,7 +613,7 @@ static int axp20x_match_device(struct axp20x_dev *axp20x) ...@@ -613,7 +613,7 @@ static int axp20x_match_device(struct axp20x_dev *axp20x)
const struct of_device_id *of_id; const struct of_device_id *of_id;
if (dev->of_node) { if (dev->of_node) {
of_id = of_match_device(axp20x_of_match, dev); of_id = of_match_device(dev->driver->of_match_table, dev);
if (!of_id) { if (!of_id) {
dev_err(dev, "Unable to match OF ID\n"); dev_err(dev, "Unable to match OF ID\n");
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment