]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
rtc: isl1208: Simplify probe()
authorBiju Das <biju.das.jz@bp.renesas.com>
Mon, 10 Jul 2023 11:47:47 +0000 (12:47 +0100)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Thu, 27 Jul 2023 21:06:28 +0000 (23:06 +0200)
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>
drivers/rtc/rtc-isl1208.c

index b0712b4e364891656598d0d764c92398057f346d..57e77b55e4842db344f35e9a2affde420fc6a3dd 100644 (file)
@@ -862,17 +862,9 @@ isl1208_probe(struct i2c_client *client)
        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 {
-               const struct i2c_device_id *id = i2c_match_id(isl1208_id, client);
-
-               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)