diff mbox series

[5.10.y-cip,11/15] rtc: isl1208: Simplify probe()

Message ID	20230911144702.948246-12-biju.das.jz@bp.renesas.com (mailing list archive)
State	Accepted
Headers	show Return-Path: <biju.das.jz@bp.renesas.com> ip: 210.160.252.171, mailfrom: biju.das.jz@bp.renesas.com) From: Biju Das <biju.das.jz@bp.renesas.com> To: cip-dev@lists.cip-project.org, Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>, Pavel Machek <pavel@denx.de> Cc: Biju Das <biju.das.jz@bp.renesas.com>, Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> Subject: [PATCH 5.10.y-cip 11/15] rtc: isl1208: Simplify probe() Date: Mon, 11 Sep 2023 15:46:58 +0100 Message-Id: <20230911144702.948246-12-biju.das.jz@bp.renesas.com> In-Reply-To: <20230911144702.948246-1-biju.das.jz@bp.renesas.com> References: <20230911144702.948246-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	Enable Renesas PMIC RAA215300 and RTC builtin support \| expand [5.10.y-cip,00/15] Enable Renesas PMIC RAA215300 and RTC builtin support [5.10.y-cip,01/15] rtc: isl1208: Fix clock tick timed out message [5.10.y-cip,02/15] rtc: destroy mutex when releasing the device [5.10.y-cip,03/15] clk: fixed-rate: add devm_clk_hw_register_fixed_rate [5.10.y-cip,04/15] i2c: Add i2c_get_match_data() [5.10.y-cip,05/15] regulator: raa215300: Update help description [5.10.y-cip,06/15] regulator: raa215300: Change the scope of the variables {clkin_name, xin_name} [5.10.y-cip,07/15] regulator: raa215300: Fix resource leak in case of error [5.10.y-cip,08/15] regulator: raa215300: Add const definition [5.10.y-cip,09/15] regulator: raa215300: Change rate from 32000->32768 [5.10.y-cip,10/15] regulator: raa215300: Add missing blank space [5.10.y-cip,11/15] rtc: isl1208: Simplify probe() [5.10.y-cip,12/15] rtc: isl1208: Fix incorrect logic in isl1208_set_xtoscb() [5.10.y-cip,13/15] arm64: defconfig: Enable PMIC RAA215300 and RTC ISL 1208 configs [5.10.y-cip,14/15] arm64: dts: renesas: rzg2l-smarc-som: Enable PMIC and built-in RTC [5.10.y-cip,15/15] arm64: dts: renesas: rzg2lc-smarc-som: Enable PMIC and built-in RTC

Commit Message

Biju Das Sept. 11, 2023, 2:46 p.m. UTC

commit b7f73b6e921b457a222e86cf53fe3950c6b5aed5 upstream.

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>
Link: https://lore.kernel.org/r/20230710114747.106496-1-biju.das.jz@bp.renesas.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
 drivers/rtc/rtc-isl1208.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/drivers/rtc/rtc-isl1208.c b/drivers/rtc/rtc-isl1208.c
index a6f74cbc8c0a..92ee75fbf4b7 100644
--- a/drivers/rtc/rtc-isl1208.c
+++ b/drivers/rtc/rtc-isl1208.c
@@ -862,15 +862,9 @@  isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	i2c_set_clientdata(client, isl1208);
 
 	/* Determine which chip we have */
-	if (client->dev.of_node) {
-		isl1208->config = of_device_get_match_data(&client->dev);
-		if (!isl1208->config)
-			return -ENODEV;
-	} else {
-		if (!id)
-			return -ENODEV;
-		isl1208->config = (struct isl1208_config *)id->driver_data;
-	}
+	isl1208->config = i2c_get_match_data(client);
+	if (!isl1208->config)
+		return -ENODEV;
 
 	rc = isl1208_clk_present(client, "xin");
 	if (rc < 0)