From: Biju Das <biju.das.jz@bp.renesas.com>
To: Peter Rosin <peda@axentia.se>
Cc: Biju Das <biju.das.jz@bp.renesas.com>,
Michael Hennerich <michael.hennerich@analog.com>,
linux-i2c@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>,
Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>,
linux-renesas-soc@vger.kernel.org
Subject: [PATCH v2 1/2] i2c: mux: ltc4306: Simplify probe()
Date: Mon, 17 Jul 2023 14:48:06 +0100 [thread overview]
Message-ID: <20230717134807.265302-2-biju.das.jz@bp.renesas.com> (raw)
In-Reply-To: <20230717134807.265302-1-biju.das.jz@bp.renesas.com>
The ltc4306_id[].driver_data could store a pointer to the chips,
like for DT-based matching, making I2C and DT-based matching
more similar.
After that, we can simplify the probe() by replacing of_device_get_
match_data() and i2c_match_id() by i2c_get_match_data() as we have
similar I2C and DT-based matching table.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v1->v2:
* Added Rb tag from Geert.
---
drivers/i2c/muxes/i2c-mux-ltc4306.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/i2c/muxes/i2c-mux-ltc4306.c b/drivers/i2c/muxes/i2c-mux-ltc4306.c
index 5a03031519be..c7dfd5eba413 100644
--- a/drivers/i2c/muxes/i2c-mux-ltc4306.c
+++ b/drivers/i2c/muxes/i2c-mux-ltc4306.c
@@ -192,8 +192,8 @@ static int ltc4306_deselect_mux(struct i2c_mux_core *muxc, u32 chan)
}
static const struct i2c_device_id ltc4306_id[] = {
- { "ltc4305", ltc_4305 },
- { "ltc4306", ltc_4306 },
+ { "ltc4305", .driver_data = (kernel_ulong_t)&chips[ltc_4305] },
+ { "ltc4306", .driver_data = (kernel_ulong_t)&chips[ltc_4306] },
{ }
};
MODULE_DEVICE_TABLE(i2c, ltc4306_id);
@@ -216,10 +216,9 @@ static int ltc4306_probe(struct i2c_client *client)
unsigned int val = 0;
int num, ret;
- chip = of_device_get_match_data(&client->dev);
-
+ chip = i2c_get_match_data(client);
if (!chip)
- chip = &chips[i2c_match_id(ltc4306_id, client)->driver_data];
+ return -ENODEV;
idle_disc = device_property_read_bool(&client->dev,
"i2c-mux-idle-disconnect");
--
2.25.1
next prev parent reply other threads:[~2023-07-17 13:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-17 13:48 [PATCH v2 0/2] ltc4306 driver enhancements Biju Das
2023-07-17 13:48 ` Biju Das [this message]
2023-07-17 13:48 ` [PATCH v2 2/2] i2c: mux: ltc4306: Drop enum ltc_type and split chips[] Biju Das
2023-08-05 13:12 ` Andi Shyti
2023-08-05 14:13 ` Peter Rosin
2023-08-05 14:25 ` 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=20230717134807.265302-2-biju.das.jz@bp.renesas.com \
--to=biju.das.jz@bp.renesas.com \
--cc=geert+renesas@glider.be \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=michael.hennerich@analog.com \
--cc=peda@axentia.se \
--cc=prabhakar.mahadev-lad.rj@bp.renesas.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.