Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1293090

[PATCH v6 3/9] mfd: axp20x: use dev->driver->of_match_table in axp20x_match_device()

Show all headers | View raw

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>
---
 drivers/mfd/axp20x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
2.6.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v6 0/9] mfd: axp20x: Add support for RSB based AXP223 Chen-Yu Tsai <wens@csie.org> - 2015-12-16 17:40 +0100
  [PATCH v6 1/9] mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings Chen-Yu Tsai <wens@csie.org> - 2015-12-16 17:40 +0100
  [PATCH v6 7/9] regulator: axp20x: Support new AXP223 PMIC Chen-Yu Tsai <wens@csie.org> - 2015-12-16 17:40 +0100
  [PATCH v6 3/9] mfd: axp20x: use dev->driver->of_match_table in axp20x_match_device() Chen-Yu Tsai <wens@csie.org> - 2015-12-16 17:40 +0100
  [PATCH v6 6/9] mfd: axp20x: Add support for RSB based AXP223 PMIC Chen-Yu Tsai <wens@csie.org> - 2015-12-16 17:40 +0100
  [PATCH v6 9/9] ARM: dts: sun8i: q8-common: Add AXP223 PMIC device and regulator nodes Chen-Yu Tsai <wens@csie.org> - 2015-12-16 17:40 +0100
  [PATCH v6 5/9] mfd: axp20x: Whitespace, open parenthesis alignment code style fixes Chen-Yu Tsai <wens@csie.org> - 2015-12-16 17:40 +0100

csiph-web