leds: Remove redundant of_match_ptr()

The driver depends on CONFIG_OF, so it is not necessary to use
of_match_ptr() here. We remove both CONFIG_OF and of_match_ptr() here.

Signed-off-by: Zhu Wang <wangzhu9@huawei.com>
Link: https://lore.kernel.org/r/20230808111108.24262-1-wangzhu9@huawei.com
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/drivers/leds/leds-an30259a.c b/drivers/leds/leds-an30259a.c
index 24b1041..0216afe 100644 (file)
--- a/drivers/leds/leds-an30259a.c
+++ b/drivers/leds/leds-an30259a.c
@@ -344,7 +344,7 @@ MODULE_DEVICE_TABLE(i2c, an30259a_id);
 static struct i2c_driver an30259a_driver = {
        .driver = {
                .name = "leds-an30259a",
-               .of_match_table = of_match_ptr(an30259a_match_table),
+               .of_match_table = an30259a_match_table,
        },
        .probe = an30259a_probe,
        .remove = an30259a_remove,

diff --git a/drivers/leds/leds-aw2013.c b/drivers/leds/leds-aw2013.c
index 5976564..a562c01 100644 (file)
--- a/drivers/leds/leds-aw2013.c
+++ b/drivers/leds/leds-aw2013.c
@@ -420,7 +420,7 @@ MODULE_DEVICE_TABLE(of, aw2013_match_table);
 static struct i2c_driver aw2013_driver = {
        .driver = {
                .name = "leds-aw2013",
-               .of_match_table = of_match_ptr(aw2013_match_table),
+               .of_match_table = aw2013_match_table,
        },
        .probe = aw2013_probe,
        .remove = aw2013_remove,

diff --git a/drivers/leds/leds-lp5521.c b/drivers/leds/leds-lp5521.c
index 030c040..2ef19ad 100644 (file)
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
@@ -594,18 +594,17 @@ static const struct i2c_device_id lp5521_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, lp5521_id);
 
-#ifdef CONFIG_OF
 static const struct of_device_id of_lp5521_leds_match[] = {
        { .compatible = "national,lp5521", },
        {},
 };
 
 MODULE_DEVICE_TABLE(of, of_lp5521_leds_match);
-#endif
+
 static struct i2c_driver lp5521_driver = {
        .driver = {
                .name   = "lp5521",
-               .of_match_table = of_match_ptr(of_lp5521_leds_match),
+               .of_match_table = of_lp5521_leds_match,
        },
        .probe          = lp5521_probe,
        .remove         = lp5521_remove,

diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index daa6a16..38de853 100644 (file)
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -972,7 +972,6 @@ static const struct i2c_device_id lp5523_id[] = {
 
 MODULE_DEVICE_TABLE(i2c, lp5523_id);
 
-#ifdef CONFIG_OF
 static const struct of_device_id of_lp5523_leds_match[] = {
        { .compatible = "national,lp5523", },
        { .compatible = "ti,lp55231", },
@@ -980,12 +979,11 @@ static const struct of_device_id of_lp5523_leds_match[] = {
 };
 
 MODULE_DEVICE_TABLE(of, of_lp5523_leds_match);
-#endif
 
 static struct i2c_driver lp5523_driver = {
        .driver = {
                .name   = "lp5523x",
-               .of_match_table = of_match_ptr(of_lp5523_leds_match),
+               .of_match_table = of_lp5523_leds_match,
        },
        .probe          = lp5523_probe,
        .remove         = lp5523_remove,

diff --git a/drivers/leds/leds-lp5562.c b/drivers/leds/leds-lp5562.c
index 4565cc1..39db9ae 100644 (file)
--- a/drivers/leds/leds-lp5562.c
+++ b/drivers/leds/leds-lp5562.c
@@ -589,19 +589,17 @@ static const struct i2c_device_id lp5562_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, lp5562_id);
 
-#ifdef CONFIG_OF
 static const struct of_device_id of_lp5562_leds_match[] = {
        { .compatible = "ti,lp5562", },
        {},
 };
 
 MODULE_DEVICE_TABLE(of, of_lp5562_leds_match);
-#endif
 
 static struct i2c_driver lp5562_driver = {
        .driver = {
                .name   = "lp5562",
-               .of_match_table = of_match_ptr(of_lp5562_leds_match),
+               .of_match_table = of_lp5562_leds_match,
        },
        .probe          = lp5562_probe,
        .remove         = lp5562_remove,

diff --git a/drivers/leds/leds-lp8501.c b/drivers/leds/leds-lp8501.c
index f11886a..ac50aa8 100644 (file)
--- a/drivers/leds/leds-lp8501.c
+++ b/drivers/leds/leds-lp8501.c
@@ -380,19 +380,17 @@ static const struct i2c_device_id lp8501_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, lp8501_id);
 
-#ifdef CONFIG_OF
 static const struct of_device_id of_lp8501_leds_match[] = {
        { .compatible = "ti,lp8501", },
        {},
 };
 
 MODULE_DEVICE_TABLE(of, of_lp8501_leds_match);
-#endif
 
 static struct i2c_driver lp8501_driver = {
        .driver = {
                .name   = "lp8501",
-               .of_match_table = of_match_ptr(of_lp8501_leds_match),
+               .of_match_table = of_lp8501_leds_match,
        },
        .probe          = lp8501_probe,
        .remove         = lp8501_remove,