]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
hwmon: (jc42) Drop of_match_ptr() protection
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 8 Nov 2024 12:43:48 +0000 (14:43 +0200)
committerGuenter Roeck <linux@roeck-us.net>
Tue, 12 Nov 2024 21:54:55 +0000 (13:54 -0800)
This prevents use of this driver with ACPI via PRP0001 and
is an example of an anti pattern I'm trying to remove from
the kernel. Hence drop from this driver.

Also switch of.h for mod_devicetable.h include given use of
struct of_device_id which is defined in that header.

Reported-by: Konstantin Aladyshev <aladyshev22@gmail.com>
Closes: https://lore.kernel.org/r/CACSj6VW7WKv5tiAkLCvSujENJvXq1Mc7_7vtkQsRSz3JGY0i3Q@mail.gmail.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Message-ID: <20241108124348.1392473-1-andriy.shevchenko@linux.intel.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/jc42.c

index c459dce496a6edd75c63468553b31f250df732af..06f0ab2f52fa2b06152230de32801f7792b3ee6c 100644 (file)
@@ -11,6 +11,7 @@
 
 #include <linux/bitops.h>
 #include <linux/bitfield.h>
+#include <linux/mod_devicetable.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -19,7 +20,6 @@
 #include <linux/hwmon.h>
 #include <linux/err.h>
 #include <linux/mutex.h>
-#include <linux/of.h>
 #include <linux/regmap.h>
 
 /* Addresses to scan */
@@ -595,20 +595,18 @@ static const struct i2c_device_id jc42_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, jc42_id);
 
-#ifdef CONFIG_OF
 static const struct of_device_id jc42_of_ids[] = {
        { .compatible = "jedec,jc-42.4-temp", },
        { }
 };
 MODULE_DEVICE_TABLE(of, jc42_of_ids);
-#endif
 
 static struct i2c_driver jc42_driver = {
        .class          = I2C_CLASS_HWMON,
        .driver = {
                .name   = "jc42",
                .pm = JC42_DEV_PM_OPS,
-               .of_match_table = of_match_ptr(jc42_of_ids),
+               .of_match_table = jc42_of_ids,
        },
        .probe          = jc42_probe,
        .remove         = jc42_remove,