From: Biju Das <biju.das.jz@bp.renesas.com>
To: Wolfram Sang <wsa@kernel.org>
Cc: Biju Das <biju.das.jz@bp.renesas.com>,
linux-i2c@vger.kernel.org,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>,
linux-renesas-soc@vger.kernel.org
Subject: [PATCH] i2c: Add i2c_get_match_data()
Date: Mon, 22 May 2023 11:41:57 +0100 [thread overview]
Message-ID: <20230522104157.333217-1-biju.das.jz@bp.renesas.com> (raw)
Add i2c_get_match_data() similar to of_device_get_match_data(),
so that we can optimize the driver code that uses both I2C and
DT-based matching.
Suggested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
eg:
The RTC 1208 driver code [1] can be optimized with [2], which is planned
to mainline once [3] is accepted.
[1]
if (client->dev.of_node) {
isl1208->config = of_device_get_match_data(&client->dev);
if (!isl1208->config)
return -ENODEV;
} else {
const struct i2c_device_id *id = i2c_match_id(isl1208_id, client);
if (!id)
return -ENODEV;
isl1208->config = (struct isl1208_config *)id->driver_data;
}
[2]
if (client->dev.of_node)
isl1208->config = of_device_get_match_data(&client->dev);
else
isl1208->config = i2c_get_match_data(isl1208_id, client);
if (!isl1208->config)
return -ENODEV;
[3]
https://lore.kernel.org/linux-renesas-soc/20230522101849.297499-1-biju.das.jz@bp.renesas.com/T/#t
---
drivers/i2c/i2c-core-base.c | 24 ++++++++++++++++++++++--
include/linux/i2c.h | 3 +++
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 3442aa80290f..1ab639b2693c 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -99,8 +99,8 @@ const char *i2c_freq_mode_string(u32 bus_freq_hz)
}
EXPORT_SYMBOL_GPL(i2c_freq_mode_string);
-const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
- const struct i2c_client *client)
+static const struct i2c_device_id *i2c_match_device_id(const struct i2c_device_id *id,
+ const struct i2c_client *client)
{
if (!(id && client))
return NULL;
@@ -110,10 +110,30 @@ const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
return id;
id++;
}
+
return NULL;
}
+
+const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
+ const struct i2c_client *client)
+{
+ return i2c_match_device_id(id, client);
+}
EXPORT_SYMBOL_GPL(i2c_match_id);
+const void *i2c_get_match_data(const struct i2c_device_id *id,
+ const struct i2c_client *client)
+{
+ const struct i2c_device_id *match;
+
+ match = i2c_match_device_id(id, client);
+ if (!match)
+ return NULL;
+
+ return (const void *)match->driver_data;
+}
+EXPORT_SYMBOL(i2c_get_match_data);
+
static int i2c_device_match(struct device *dev, struct device_driver *drv)
{
struct i2c_client *client = i2c_verify_client(dev);
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 0ce344724209..ddfe842b8f24 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -367,6 +367,9 @@ struct i2c_adapter *i2c_verify_adapter(struct device *dev);
const struct i2c_device_id *i2c_match_id(const struct i2c_device_id *id,
const struct i2c_client *client);
+const void *i2c_get_match_data(const struct i2c_device_id *id,
+ const struct i2c_client *client);
+
static inline struct i2c_client *kobj_to_i2c_client(struct kobject *kobj)
{
struct device * const dev = kobj_to_dev(kobj);
--
2.25.1
next reply other threads:[~2023-05-22 10:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-22 10:41 Biju Das [this message]
2023-05-22 11:28 ` [PATCH] i2c: Add i2c_get_match_data() Geert Uytterhoeven
2023-05-22 12:38 ` Biju Das
2023-05-22 12:42 ` Geert Uytterhoeven
2023-06-01 15:44 ` Biju Das
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=20230522104157.333217-1-biju.das.jz@bp.renesas.com \
--to=biju.das.jz@bp.renesas.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=geert+renesas@glider.be \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.com \
--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).