Skip to content

Commit 4f3688d

Browse files
PeterZhu789alexandrebelloni
authored andcommitted
1 parent df9c16b commit 4f3688d

5 files changed

Lines changed: 5 additions & 7 deletions

File tree

drivers/rtc/rtc-armada38x.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,6 @@ static const struct armada38x_rtc_data armada8k_data = {
473473
.alarm = ALARM2,
474474
};
475475

476-
#ifdef CONFIG_OF
477476
static const struct of_device_id armada38x_rtc_of_match_table[] = {
478477
{
479478
.compatible = "marvell,armada-380-rtc",
@@ -486,7 +485,6 @@ static const struct of_device_id armada38x_rtc_of_match_table[] = {
486485
{}
487486
};
488487
MODULE_DEVICE_TABLE(of, armada38x_rtc_of_match_table);
489-
#endif
490488

491489
static __init int armada38x_rtc_probe(struct platform_device *pdev)
492490
{
@@ -576,7 +574,7 @@ static struct platform_driver armada38x_rtc_driver = {
576574
.driver = {
577575
.name = "armada38x-rtc",
578576
.pm = &armada38x_rtc_pm_ops,
579-
.of_match_table = of_match_ptr(armada38x_rtc_of_match_table),
577+
.of_match_table = armada38x_rtc_of_match_table,
580578
},
581579
};
582580

drivers/rtc/rtc-aspeed.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ MODULE_DEVICE_TABLE(of, aspeed_rtc_match);
118118
static struct platform_driver aspeed_rtc_driver = {
119119
.driver = {
120120
.name = "aspeed-rtc",
121-
.of_match_table = of_match_ptr(aspeed_rtc_match),
121+
.of_match_table = aspeed_rtc_match,
122122
},
123123
};
124124

drivers/rtc/rtc-at91rm9200.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ static struct platform_driver at91_rtc_driver = {
641641
.driver = {
642642
.name = "at91_rtc",
643643
.pm = &at91_rtc_pm_ops,
644-
.of_match_table = of_match_ptr(at91_rtc_dt_ids),
644+
.of_match_table = at91_rtc_dt_ids,
645645
},
646646
};
647647

drivers/rtc/rtc-at91sam9.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ static struct platform_driver at91_rtc_driver = {
534534
.driver = {
535535
.name = "rtc-at91sam9",
536536
.pm = &at91_rtc_pm_ops,
537-
.of_match_table = of_match_ptr(at91_rtc_dt_ids),
537+
.of_match_table = at91_rtc_dt_ids,
538538
},
539539
};
540540

drivers/rtc/rtc-nct3018y.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ MODULE_DEVICE_TABLE(of, nct3018y_of_match);
538538
static struct i2c_driver nct3018y_driver = {
539539
.driver = {
540540
.name = "rtc-nct3018y",
541-
.of_match_table = of_match_ptr(nct3018y_of_match),
541+
.of_match_table = nct3018y_of_match,
542542
},
543543
.probe = nct3018y_probe,
544544
.id_table = nct3018y_id,

0 commit comments

Comments
 (0)