From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
To: Support Opensource <support.opensource@diasemi.com>,
Lee Jones <lee.jones@linaro.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Tony Lindgren <tony@atomide.com>,
linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
linux-omap@vger.kernel.org, patches@opensource.cirrus.com
Subject: [PATCH 1/7] mfd: max8997: Simplify getting of_device_id match data
Date: Mon, 19 Apr 2021 10:17:20 +0200 [thread overview]
Message-ID: <20210419081726.67867-1-krzysztof.kozlowski@canonical.com> (raw)
Use of_device_get_match_data() to make the code slightly smaller.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
drivers/mfd/max8997.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index 68d8f2b95287..f89b1eb121c9 100644
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -11,6 +11,7 @@
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/of_irq.h>
#include <linux/interrupt.h>
#include <linux/pm_runtime.h>
@@ -145,11 +146,9 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
static inline unsigned long max8997_i2c_get_driver_data(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
- if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {
- const struct of_device_id *match;
- match = of_match_node(max8997_pmic_dt_match, i2c->dev.of_node);
- return (unsigned long)match->data;
- }
+ if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node)
+ return (unsigned long)of_device_get_match_data(&i2c->dev);
+
return id->driver_data;
}
--
2.25.1
next reply other threads:[~2021-04-19 8:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 8:17 Krzysztof Kozlowski [this message]
2021-04-19 8:17 ` [PATCH 2/7] mfd: max8998: Simplify getting of_device_id match data Krzysztof Kozlowski
2021-04-19 8:17 ` [PATCH 3/7] mfd: da9052: " Krzysztof Kozlowski
2021-04-19 11:00 ` Adam Thomson
2021-04-19 8:17 ` [PATCH 4/7] " Krzysztof Kozlowski
2021-04-19 11:00 ` Adam Thomson
2021-04-19 11:04 ` Krzysztof Kozlowski
2021-04-19 8:17 ` [PATCH 5/7] mfd: sec: " Krzysztof Kozlowski
2021-04-20 5:25 ` Marek Szyprowski
2021-04-20 7:03 ` Krzysztof Kozlowski
2021-04-20 7:12 ` Marek Szyprowski
2021-04-20 7:25 ` Krzysztof Kozlowski
2021-04-19 8:17 ` [PATCH 6/7] mfd: wm831x: Correct kerneldoc Krzysztof Kozlowski
2021-04-19 8:41 ` Charles Keepax
2021-04-19 8:17 ` [PATCH 7/7] mfd: twl: " Krzysztof Kozlowski
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=20210419081726.67867-1-krzysztof.kozlowski@canonical.com \
--to=krzysztof.kozlowski@canonical.com \
--cc=b.zolnierkie@samsung.com \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=support.opensource@diasemi.com \
--cc=tony@atomide.com \
/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).