rtc: isl12022: Drop unneeded OF guards and of_match_ptr()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 10 Jan 2023 14:08:04 +0000 (16:08 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Wed, 22 Feb 2023 20:06:30 +0000 (21:06 +0100)
Drop unneeded OF guards and of_match_ptr(). This allows use of
the driver with other types of firmware such as ACPI PRP0001 based
probing.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230110140806.87432-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-isl12022.c

index bf1aa6f6560de80759e441ff777a7611f18796fe..77b4763f2a70af2b57069f89097cf83b96449750 100644 (file)
@@ -14,8 +14,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/err.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/regmap.h>
 #include <linux/hwmon.h>
 
@@ -46,8 +44,6 @@
 
 #define ISL12022_BETA_TSE      (1 << 7)
 
-static struct i2c_driver isl12022_driver;
-
 static umode_t isl12022_hwmon_is_visible(const void *data,
                                         enum hwmon_sensor_types type,
                                         u32 attr, int channel)
@@ -252,14 +248,12 @@ static int isl12022_probe(struct i2c_client *client)
        return devm_rtc_register_device(rtc);
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id isl12022_dt_match[] = {
        { .compatible = "isl,isl12022" }, /* for backward compat., don't use */
        { .compatible = "isil,isl12022" },
        { },
 };
 MODULE_DEVICE_TABLE(of, isl12022_dt_match);
-#endif
 
 static const struct i2c_device_id isl12022_id[] = {
        { "isl12022", 0 },
@@ -270,9 +264,7 @@ MODULE_DEVICE_TABLE(i2c, isl12022_id);
 static struct i2c_driver isl12022_driver = {
        .driver         = {
                .name   = "rtc-isl12022",
-#ifdef CONFIG_OF
-               .of_match_table = of_match_ptr(isl12022_dt_match),
-#endif
+               .of_match_table = isl12022_dt_match,
        },
        .probe_new      = isl12022_probe,
        .id_table       = isl12022_id,