2 files changed, 8 insertions, 10 deletions

diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
index 7ce6065dc20e..eb5cd28bc6d8 100644
--- a/drivers/misc/carma/carma-fpga-program.c
+++ b/drivers/misc/carma/carma-fpga-program.c
@@ -945,8 +945,7 @@ static int fpga_of_remove(struct platform_device *op)
 /* CTL-CPLD Version Register */
 #define CTL_CPLD_VERSION        0x2000
 
-static int fpga_of_probe(struct platform_device *op,
-                         const struct of_device_id *match)
+static int fpga_of_probe(struct platform_device *op)
 {
         struct device_node *of_node = op->dev.of_node;
         struct device *this_device;
@@ -1107,7 +1106,7 @@ static struct of_device_id fpga_of_match[] = {
         {},
 };
 
-static struct of_platform_driver fpga_of_driver = {
+static struct platform_driver fpga_of_driver = {
         .probe          = fpga_of_probe,
         .remove         = fpga_of_remove,
         .driver         = {
@@ -1124,12 +1123,12 @@ static struct of_platform_driver fpga_of_driver = {
 static int __init fpga_init(void)
 {
         led_trigger_register_simple("fpga", &ledtrig_fpga);
-        return of_register_platform_driver(&fpga_of_driver);
+        return platform_driver_register(&fpga_of_driver);
 }
 
 static void __exit fpga_exit(void)
 {
-        of_unregister_platform_driver(&fpga_of_driver);
+        platform_driver_unregister(&fpga_of_driver);
         led_trigger_unregister_simple(ledtrig_fpga);
 }
 
diff --git a/drivers/misc/carma/carma-fpga.c b/drivers/misc/carma/carma-fpga.c
index 3965821fef17..14e974b2a781 100644
--- a/drivers/misc/carma/carma-fpga.c
+++ b/drivers/misc/carma/carma-fpga.c
@@ -1249,8 +1249,7 @@ static bool dma_filter(struct dma_chan *chan, void *data)
         return true;
 }
 
-static int data_of_probe(struct platform_device *op,
-                         const struct of_device_id *match)
+static int data_of_probe(struct platform_device *op)
 {
         struct device_node *of_node = op->dev.of_node;
         struct device *this_device;
@@ -1401,7 +1400,7 @@ static struct of_device_id data_of_match[] = {
         {},
 };
 
-static struct of_platform_driver data_of_driver = {
+static struct platform_driver data_of_driver = {
         .probe          = data_of_probe,
         .remove         = data_of_remove,
         .driver         = {
@@ -1417,12 +1416,12 @@ static struct of_platform_driver data_of_driver = {
 
 static int __init data_init(void)
 {
-        return of_register_platform_driver(&data_of_driver);
+        return platform_driver_register(&data_of_driver);
 }
 
 static void __exit data_exit(void)
 {
-        of_unregister_platform_driver(&data_of_driver);
+        platform_driver_unregister(&data_of_driver);
 }
 
 MODULE_AUTHOR("Ira W. Snyder <iws@ovro.caltech.edu>");