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


Groups > linux.kernel > #1332497

[PATCH v8 03/10] mfd: axp20x: use dev->driver->of_match_table in axp20x_match_device()

From Chen-Yu Tsai <wens@csie.org>
Newsgroups linux.kernel
Subject [PATCH v8 03/10] mfd: axp20x: use dev->driver->of_match_table in axp20x_match_device()
Date 2016-02-12 03:10 +0100
Message-ID <r1bli-wq-37@gated-at.bofh.it> (permalink)
References <r1blh-wq-11@gated-at.bofh.it>
Organization linux.* mail to news gateway

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>
Acked-by: Lee Jones <lee.jones@linaro.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.7.0

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


Thread

[PATCH v8 00/10] mfd: axp20x: Add support for RSB based AXP223 Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100
  [PATCH v8 04/10] mfd: axp20x: Add missing copyright notice Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100
  [PATCH v8 01/10] mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100
  [PATCH v8 06/10] mfd: axp20x: Whitespace, open parenthesis alignment code style fixes Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100
  [PATCH v8 05/10] mfd: axp20x: Split the driver into core and i2c bits Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100
  [PATCH v8 02/10] mfd: axp20x: Remove second struct device * parameter for axp20x_match_device() Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100
  [PATCH v8 08/10] regulator: axp20x: Support new AXP223 PMIC Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100
  [PATCH v8 09/10] ARM: dts: sun8i: sinlinx-sina33: Add AXP223 PMIC device and regulator nodes Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100
  [PATCH v8 07/10] mfd: axp20x: Add support for RSB based AXP223 PMIC Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100
  [PATCH v8 03/10] mfd: axp20x: use dev->driver->of_match_table in axp20x_match_device() Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100
  [GIT PULL] Immutable branch between MFD and Regulator Lee Jones <lee.jones@linaro.org> - 2016-02-12 10:10 +0100
  Re: [PATCH v8 00/10] mfd: axp20x: Add support for RSB based AXP223 Lee Jones <lee.jones@linaro.org> - 2016-02-12 10:10 +0100
  Re: [PATCH v8 00/10] mfd: axp20x: Add support for RSB based AXP223 Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-02-16 09:10 +0100

csiph-web