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
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
Sylwester Nawrocki <snawrocki@kernel.org>,
Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Subject: [PATCH v2 4/7] mfd: da9062: Simplify getting of_device_id match data
Date: Tue, 20 Apr 2021 13:39:26 +0200 [thread overview]
Message-ID: <20210420113929.278082-4-krzysztof.kozlowski@canonical.com> (raw)
In-Reply-To: <20210420113929.278082-1-krzysztof.kozlowski@canonical.com>
Use of_device_get_match_data() to make the code slightly smaller.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
---
Changes since v1:
1. Add Ack
2. Correct subject prefix
---
drivers/mfd/da9062-core.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c
index 8d913375152d..01f8e10dfa55 100644
--- a/drivers/mfd/da9062-core.c
+++ b/drivers/mfd/da9062-core.c
@@ -9,6 +9,7 @@
#include <linux/init.h>
#include <linux/device.h>
#include <linux/interrupt.h>
+#include <linux/of_device.h>
#include <linux/regmap.h>
#include <linux/irq.h>
#include <linux/mfd/core.h>
@@ -622,7 +623,6 @@ static int da9062_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct da9062 *chip;
- const struct of_device_id *match;
unsigned int irq_base;
const struct mfd_cell *cell;
const struct regmap_irq_chip *irq_chip;
@@ -635,15 +635,10 @@ static int da9062_i2c_probe(struct i2c_client *i2c,
if (!chip)
return -ENOMEM;
- if (i2c->dev.of_node) {
- match = of_match_node(da9062_dt_ids, i2c->dev.of_node);
- if (!match)
- return -EINVAL;
-
- chip->chip_type = (uintptr_t)match->data;
- } else {
+ if (i2c->dev.of_node)
+ chip->chip_type = (uintptr_t)of_device_get_match_data(&i2c->dev);
+ else
chip->chip_type = id->driver_data;
- }
i2c_set_clientdata(i2c, chip);
chip->dev = &i2c->dev;
--
2.25.1
next prev parent reply other threads:[~2021-04-20 11:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-20 11:39 [PATCH v2 1/7] mfd: max8997: Simplify getting of_device_id match data Krzysztof Kozlowski
2021-04-20 11:39 ` [PATCH v2 2/7] mfd: max8998: " Krzysztof Kozlowski
2021-04-20 11:39 ` [PATCH v2 3/7] mfd: da9052: " Krzysztof Kozlowski
2021-04-20 11:39 ` Krzysztof Kozlowski [this message]
2021-04-20 11:39 ` [PATCH v2 5/7] mfd: sec: " Krzysztof Kozlowski
2021-04-20 11:39 ` [PATCH v2 6/7] mfd: wm831x: Correct kerneldoc Krzysztof Kozlowski
2021-04-23 8:05 ` Lee Jones
2021-04-20 11:39 ` [PATCH v2 7/7] mfd: twl: " Krzysztof Kozlowski
2021-04-23 8:04 ` 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=20210420113929.278082-4-krzysztof.kozlowski@canonical.com \
--to=krzysztof.kozlowski@canonical.com \
--cc=Adam.Thomson.Opensource@diasemi.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=m.szyprowski@samsung.com \
--cc=patches@opensource.cirrus.com \
--cc=snawrocki@kernel.org \
--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).