rtc: remove redundant of_match_ptr()

Signed-off-by: Zhu Wang <wangzhu9@huawei.com>
Link: https://lore.kernel.org/r/20230808115213.154377-2-wangzhu9@huawei.com
Link: https://lore.kernel.org/r/20230808115213.154377-3-wangzhu9@huawei.com
Link: https://lore.kernel.org/r/20230808115213.154377-4-wangzhu9@huawei.com
Link: https://lore.kernel.org/r/20230808115213.154377-5-wangzhu9@huawei.com
Link: https://lore.kernel.org/r/20230808115213.154377-6-wangzhu9@huawei.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/rtc/rtc-armada38x.c b/drivers/rtc/rtc-armada38x.c
index 8abcad38b10c256afa06122b764e4941c866419b..569c1054d6b0bcd3be4263a35804981b94b79cf3 100644 (file)
--- a/drivers/rtc/rtc-armada38x.c
+++ b/drivers/rtc/rtc-armada38x.c
@@ -473,7 +473,6 @@ static const struct armada38x_rtc_data armada8k_data = {
        .alarm = ALARM2,
 };
 
-#ifdef CONFIG_OF
 static const struct of_device_id armada38x_rtc_of_match_table[] = {
        {
                .compatible = "marvell,armada-380-rtc",
@@ -486,7 +485,6 @@ static const struct of_device_id armada38x_rtc_of_match_table[] = {
        {}
 };
 MODULE_DEVICE_TABLE(of, armada38x_rtc_of_match_table);
-#endif
 
 static __init int armada38x_rtc_probe(struct platform_device *pdev)
 {
@@ -576,7 +574,7 @@ static struct platform_driver armada38x_rtc_driver = {
        .driver         = {
                .name   = "armada38x-rtc",
                .pm     = &armada38x_rtc_pm_ops,
-               .of_match_table = of_match_ptr(armada38x_rtc_of_match_table),
+               .of_match_table = armada38x_rtc_of_match_table,
        },
 };
 

diff --git a/drivers/rtc/rtc-aspeed.c b/drivers/rtc/rtc-aspeed.c
index a93352ed3aec99f94612248a2b4a4d2a145a3615..880b015eebaf796f68ed82c29998f345e1fd418b 100644 (file)
--- a/drivers/rtc/rtc-aspeed.c
+++ b/drivers/rtc/rtc-aspeed.c
@@ -118,7 +118,7 @@ MODULE_DEVICE_TABLE(of, aspeed_rtc_match);
 static struct platform_driver aspeed_rtc_driver = {
        .driver = {
                .name = "aspeed-rtc",
-               .of_match_table = of_match_ptr(aspeed_rtc_match),
+               .of_match_table = aspeed_rtc_match,
        },
 };
 

diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index 245588a7b417c6e84509f67881d509c34bdf8150..add4f71d7b3b98db7fa0e5e993add4ba0448ecdf 100644 (file)
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -641,7 +641,7 @@ static struct platform_driver at91_rtc_driver = {
        .driver         = {
                .name   = "at91_rtc",
                .pm     = &at91_rtc_pm_ops,
-               .of_match_table = of_match_ptr(at91_rtc_dt_ids),
+               .of_match_table = at91_rtc_dt_ids,
        },
 };
 

diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index 610f27dfc462dad34ee65e6e81c2e750af8bc2d8..f93bee96e3623330b179e459b2c41e9084709f31 100644 (file)
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -534,7 +534,7 @@ static struct platform_driver at91_rtc_driver = {
        .driver         = {
                .name   = "rtc-at91sam9",
                .pm     = &at91_rtc_pm_ops,
-               .of_match_table = of_match_ptr(at91_rtc_dt_ids),
+               .of_match_table = at91_rtc_dt_ids,
        },
 };
 

diff --git a/drivers/rtc/rtc-nct3018y.c b/drivers/rtc/rtc-nct3018y.c
index a4e3f924837e0cf904a8c098ccdff895ae1e3fed..ed4e606be8e58d2779bd6aff148b388435770830 100644 (file)
--- a/drivers/rtc/rtc-nct3018y.c
+++ b/drivers/rtc/rtc-nct3018y.c
@@ -538,7 +538,7 @@ MODULE_DEVICE_TABLE(of, nct3018y_of_match);
 static struct i2c_driver nct3018y_driver = {
        .driver         = {
                .name   = "rtc-nct3018y",
-               .of_match_table = of_match_ptr(nct3018y_of_match),
+               .of_match_table = nct3018y_of_match,
        },
        .probe          = nct3018y_probe,
        .id_table       = nct3018y_id,