From: Chris Packham <chris.packham@alliedtelesis.co.nz>
To: Wolfram Sang <wsa@kernel.org>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Chris Packham <chris.packham@alliedtelesis.co.nz>
Subject: [PATCH v4 5/6] i2c: mpc: Use device_get_match_data() helper
Date: Thu, 15 Apr 2021 10:33:24 +1200 [thread overview]
Message-ID: <20210414223325.23352-6-chris.packham@alliedtelesis.co.nz> (raw)
In-Reply-To: <20210414223325.23352-1-chris.packham@alliedtelesis.co.nz>
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Use the device_get_match_data() helper instead of open coding.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
drivers/i2c/busses/i2c-mpc.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 0865f7ac80bd..7a9abeeb6da0 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -14,6 +14,7 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>
+#include <linux/property.h>
#include <linux/slab.h>
#include <linux/clk.h>
@@ -689,10 +690,9 @@ static struct i2c_bus_recovery_info fsl_i2c_recovery_info = {
.recover_bus = fsl_i2c_bus_recovery,
};
-static const struct of_device_id mpc_i2c_of_match[];
static int fsl_i2c_probe(struct platform_device *op)
{
- const struct of_device_id *match;
+ const struct mpc_i2c_data *data;
struct mpc_i2c *i2c;
const u32 *prop;
u32 clock = MPC_I2C_CLOCK_LEGACY;
@@ -701,10 +701,6 @@ static int fsl_i2c_probe(struct platform_device *op)
struct clk *clk;
int err;
- match = of_match_device(mpc_i2c_of_match, &op->dev);
- if (!match)
- return -EINVAL;
-
i2c = devm_kzalloc(&op->dev, sizeof(*i2c), GFP_KERNEL);
if (!i2c)
return -ENOMEM;
@@ -756,8 +752,8 @@ static int fsl_i2c_probe(struct platform_device *op)
clock = *prop;
}
- if (match->data) {
- const struct mpc_i2c_data *data = match->data;
+ data = device_get_match_data(&op->dev);
+ if (data) {
data->setup(op->dev.of_node, i2c, clock);
} else {
/* Backwards compatibility */
--
2.31.1
next prev parent reply other threads:[~2021-04-14 22:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-14 22:33 [PATCH v4 0/6] i2c: mpc: Refactor to improve responsiveness Chris Packham
2021-04-14 22:33 ` [PATCH v4 1/6] i2c: mpc: Interrupt driven transfer Chris Packham
2021-04-14 22:33 ` [PATCH v4 2/6] i2c: mpc: Update license and copyright Chris Packham
2021-04-14 22:33 ` [PATCH v4 3/6] i2c: mpc: Use devm_clk_get_optional() Chris Packham
2021-04-14 22:33 ` [PATCH v4 4/6] i2c: mpc: Remove CONFIG_PM_SLEEP ifdeffery Chris Packham
2021-04-14 22:33 ` Chris Packham [this message]
2021-04-14 22:33 ` [PATCH v4 6/6] i2c: mpc: Drop duplicate message from devm_platform_ioremap_resource() Chris Packham
2021-04-15 20:09 ` [PATCH v4 0/6] i2c: mpc: Refactor to improve responsiveness Wolfram Sang
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=20210414223325.23352-6-chris.packham@alliedtelesis.co.nz \
--to=chris.packham@alliedtelesis.co.nz \
--cc=andriy.shevchenko@linux.intel.com \
--cc=andy.shevchenko@gmail.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@kernel.org \
/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).