From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
To: Lee Jones <lee.jones@linaro.org>,
Support Opensource <support.opensource@diasemi.com>,
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: [RESEND PATCH v2 02/13] mfd: max8998: Simplify getting of_device_id match data
Date: Wed, 26 May 2021 08:47:00 -0400 [thread overview]
Message-ID: <20210526124711.33223-3-krzysztof.kozlowski@canonical.com> (raw)
In-Reply-To: <20210526124711.33223-1-krzysztof.kozlowski@canonical.com>
Use of_device_get_match_data() to make the code slightly smaller. There
is also no need to wrap it in a check for CONFIG_OF, because dev.of_node
will be set only with OF support.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
Changes since v1:
1. Remove check for CONFIG_OF
---
drivers/mfd/max8998.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index 785f8e9841b7..0eb15e611b67 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -12,6 +12,7 @@
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/of_irq.h>
#include <linux/pm_runtime.h>
#include <linux/mutex.h>
@@ -155,11 +156,8 @@ static struct max8998_platform_data *max8998_i2c_parse_dt_pdata(
static inline unsigned long max8998_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(max8998_dt_match, i2c->dev.of_node);
- return (unsigned long)match->data;
- }
+ if (i2c->dev.of_node)
+ return (unsigned long)of_device_get_match_data(&i2c->dev);
return id->driver_data;
}
--
2.27.0
next prev parent reply other threads:[~2021-05-26 12:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 12:46 [RESEND PATCH v2 00/13] Simplify + drop board file support for Samsung PMIC Krzysztof Kozlowski
2021-05-26 12:46 ` [RESEND PATCH v2 01/13] mfd: max8997: Simplify getting of_device_id match data Krzysztof Kozlowski
2021-05-26 12:47 ` Krzysztof Kozlowski [this message]
2021-05-26 12:47 ` [RESEND PATCH v2 03/13] mfd: da9052: " Krzysztof Kozlowski
2021-05-26 12:47 ` [RESEND PATCH v2 04/13] mfd: da9062: " Krzysztof Kozlowski
2021-05-26 12:47 ` [RESEND PATCH v2 05/13] mfd: sec: " Krzysztof Kozlowski
2021-05-26 12:47 ` [RESEND PATCH v2 06/13] mfd: wm831x: Correct kerneldoc Krzysztof Kozlowski
2021-05-26 14:49 ` Lee Jones
2021-05-26 12:47 ` [RESEND PATCH v2 07/13] mfd: twl: " Krzysztof Kozlowski
2021-05-26 14:49 ` Lee Jones
2021-05-26 12:47 ` [RESEND PATCH v2 08/13] mfd: sec: Drop support for board files and require devicetree Krzysztof Kozlowski
2021-05-26 12:47 ` [RESEND PATCH v2 09/13] mfd: sec: Remove unused cfg_pmic_irq in platform data Krzysztof Kozlowski
2021-05-26 12:47 ` [RESEND PATCH v2 10/13] mfd: sec: Remove unused device_type " Krzysztof Kozlowski
2021-05-26 12:47 ` [RESEND PATCH v2 11/13] mfd: sec: Remove unused irq_base " Krzysztof Kozlowski
2021-05-26 12:47 ` [RESEND PATCH v2 12/13] mfd: sec: Enable wakeup from suspend via devicetree property Krzysztof Kozlowski
2021-05-26 12:47 ` [RESEND PATCH v2 13/13] mfd: sec: Remove unused platform data members Krzysztof Kozlowski
2021-06-01 15:28 ` [RESEND PATCH v2 00/13] Simplify + drop board file support for Samsung PMIC Lee Jones
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=20210526124711.33223-3-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).