diff options
| author |   Chen-Yu Tsai <wens@csie.org> | 2016-02-12 10:02:40 +0800 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2016-02-12 08:51:17 +0000 |
| commit | af7acc3df7b1cad3956579c63a70a7b85b69161b (patch) | |
| tree | 6e3ed16573c1e7fd904a03f361cd6c73882fbf42 /drivers/mfd/axp20x.c | |
| parent | mfd: axp20x: Remove second struct device * parameter for axp20x_match_device() (diff) | |
| download | linux-dev-af7acc3df7b1cad3956579c63a70a7b85b69161b.tar.xz linux-dev-af7acc3df7b1cad3956579c63a70a7b85b69161b.zip | |
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: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/axp20x.c')
| -rw-r--r-- | drivers/mfd/axp20x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c index 685a78614f83..3e186f2dcac3 100644 --- a/drivers/mfd/axp20x.c +++ b/drivers/mfd/axp20x.c @@ -613,7 +613,7 @@ static int axp20x_match_device(struct axp20x_dev *axp20x) const struct of_device_id *of_id; 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) { dev_err(dev, "Unable to match OF ID\n"); return -ENODEV; |