From: Chen-Yu Tsai <wens@csie.org>
To: Lee Jones <lee.jones@linaro.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@wens.tw>, Chen-Yu Tsai <wens@csie.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
Hans de Goede <hdegoede@redhat.com>,
Mark Brown <broonie@kernel.org>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Rob Herring <robh+dt@kernel.org>
Subject: [PATCH v6 3/9] mfd: axp20x: use dev->driver->of_match_table in axp20x_match_device()
Date: Thu, 17 Dec 2015 00:32:12 +0800 [thread overview]
Message-ID: <1450283538-25067-4-git-send-email-wens@csie.org> (raw)
In-Reply-To: <1450283538-25067-1-git-send-email-wens@csie.org>
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
next prev parent reply other threads:[~2015-12-16 16:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-16 16:32 [PATCH v6 0/9] mfd: axp20x: Add support for RSB based AXP223 Chen-Yu Tsai
2015-12-16 16:32 ` [PATCH v6 1/9] mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings Chen-Yu Tsai
2015-12-16 16:32 ` [PATCH v6 2/9] mfd: axp20x: Remove second struct device * parameter for axp20x_match_device() Chen-Yu Tsai
2016-01-11 9:25 ` Lee Jones
2015-12-16 16:32 ` Chen-Yu Tsai [this message]
2016-01-11 9:25 ` [PATCH v6 3/9] mfd: axp20x: use dev->driver->of_match_table in axp20x_match_device() Lee Jones
2015-12-16 16:32 ` [PATCH v6 4/9] mfd: axp20x: Split the driver into core and i2c bits Chen-Yu Tsai
2016-01-11 9:25 ` Lee Jones
2016-01-12 2:06 ` Chen-Yu Tsai
2016-01-12 7:39 ` Lee Jones
2015-12-16 16:32 ` [PATCH v6 5/9] mfd: axp20x: Whitespace, open parenthesis alignment code style fixes Chen-Yu Tsai
2016-01-11 9:24 ` Lee Jones
2015-12-16 16:32 ` [PATCH v6 6/9] mfd: axp20x: Add support for RSB based AXP223 PMIC Chen-Yu Tsai
2016-01-11 9:24 ` Lee Jones
2016-01-11 11:58 ` Chen-Yu Tsai
2016-01-11 12:09 ` Lee Jones
2016-01-11 12:49 ` Chen-Yu Tsai
2016-01-11 13:35 ` Lee Jones
2015-12-16 16:32 ` [PATCH v6 7/9] regulator: axp20x: Support new " Chen-Yu Tsai
2015-12-16 16:32 ` [PATCH v6 8/9] ARM: dts: sun8i: sinlinx-sina33: Add AXP223 PMIC device and regulator nodes Chen-Yu Tsai
2015-12-16 16:32 ` [PATCH v6 9/9] ARM: dts: sun8i: q8-common: " Chen-Yu Tsai
2016-01-04 8:40 ` [PATCH v6 0/9] mfd: axp20x: Add support for RSB based AXP223 Chen-Yu Tsai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1450283538-25067-4-git-send-email-wens@csie.org \
--to=wens@csie.org \
--cc=andy.shevchenko@gmail.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=hdegoede@redhat.com \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@free-electrons.com \
--cc=robh+dt@kernel.org \
--cc=wens@wens.tw \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).