]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
hwmon: (tmp102) Use device_property_read_string API
authorFlaviu Nistor <flaviu.nistor@gmail.com>
Sun, 10 May 2026 09:25:43 +0000 (12:25 +0300)
committerGuenter Roeck <linux@roeck-us.net>
Tue, 9 Jun 2026 15:22:59 +0000 (08:22 -0700)
Replace of_property_read_string() with the preferded
device_property_read_string() in the probe function to
read the device label property, improving the driver
compatibility since this method is not limited to
Device Tree only.

Also drop the now unnecessary __maybe_unused from tmp102_of_match.

Signed-off-by: Flaviu Nistor <flaviu.nistor@gmail.com>
Link: https://lore.kernel.org/r/20260510092543.12352-1-flaviu.nistor@gmail.com
Link: https://lore.kernel.org/r/20260518122210.10288-1-flaviu.nistor@gmail.com
[groeck: Combined API change with __maybe_unused patch]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/tmp102.c

index 3aa1a3fbeaa92dfaea5e431dd986a284555f5bfc..ad525c55daf0f0aec05d3869ac1c73effa107d75 100644 (file)
@@ -15,7 +15,8 @@
 #include <linux/jiffies.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
-#include <linux/of.h>
+#include <linux/mod_devicetable.h>
+#include <linux/property.h>
 
 #define        DRIVER_NAME "tmp102"
 
@@ -313,7 +314,7 @@ static int tmp102_probe(struct i2c_client *client)
        if (!tmp102)
                return -ENOMEM;
 
-       of_property_read_string(dev->of_node, "label", &tmp102->label);
+       device_property_read_string(dev, "label", &tmp102->label);
 
        i2c_set_clientdata(client, tmp102);
 
@@ -400,7 +401,7 @@ static const struct i2c_device_id tmp102_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, tmp102_id);
 
-static const struct of_device_id __maybe_unused tmp102_of_match[] = {
+static const struct of_device_id tmp102_of_match[] = {
        { .compatible = "ti,tmp102" },
        { },
 };
@@ -408,7 +409,7 @@ MODULE_DEVICE_TABLE(of, tmp102_of_match);
 
 static struct i2c_driver tmp102_driver = {
        .driver.name    = DRIVER_NAME,
-       .driver.of_match_table = of_match_ptr(tmp102_of_match),
+       .driver.of_match_table = tmp102_of_match,
        .driver.pm      = pm_sleep_ptr(&tmp102_dev_pm_ops),
        .probe          = tmp102_probe,
        .id_table       = tmp102_id,