From: Biju Das <biju.das.jz@bp.renesas.com>
To: Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Biju Das <biju.das.jz@bp.renesas.com>,
linux-rtc@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>,
linux-renesas-soc@vger.kernel.org
Subject: [PATCH] rtc: ds1307: Simplify probe()
Date: Mon, 28 Aug 2023 11:45:57 +0100 [thread overview]
Message-ID: <20230828104557.45343-1-biju.das.jz@bp.renesas.com> (raw)
Simpilfy probe() by replacing device_get_match_data() and id lookup for
retrieving match data by i2c_get_match_data().
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
Note:
* This patch is only compile tested.
---
drivers/rtc/rtc-ds1307.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 506b7d1c2397..d41cbb5a1cbd 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -1714,9 +1714,7 @@ static const struct regmap_config regmap_config = {
static int ds1307_probe(struct i2c_client *client)
{
- const struct i2c_device_id *id = i2c_client_get_device_id(client);
struct ds1307 *ds1307;
- const void *match;
int err = -ENODEV;
int tmp;
const struct chip_desc *chip;
@@ -1742,17 +1740,11 @@ static int ds1307_probe(struct i2c_client *client)
i2c_set_clientdata(client, ds1307);
- match = device_get_match_data(&client->dev);
- if (match) {
- ds1307->type = (uintptr_t)match;
- chip = &chips[ds1307->type];
- } else if (id) {
- chip = &chips[id->driver_data];
- ds1307->type = id->driver_data;
- } else {
+ ds1307->type = (uintptr_t)i2c_get_match_data(client);
+ if (!ds1307->type)
return -ENODEV;
- }
+ chip = &chips[ds1307->type];
want_irq = client->irq > 0 && chip->alarm;
if (!pdata)
--
2.25.1
reply other threads:[~2023-08-28 10:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230828104557.45343-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=andriy.shevchenko@linux.intel.com \
--cc=geert+renesas@glider.be \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--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.