3 files changed, 11 insertions, 13 deletions

diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 290cb325a94c..116a49ce74b2 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -645,8 +645,7 @@ static void smu_expose_childs(struct work_struct *unused)
 
 static DECLARE_WORK(smu_expose_childs_work, smu_expose_childs);
 
-static int smu_platform_probe(struct platform_device* dev,
-                              const struct of_device_id *match)
+static int smu_platform_probe(struct platform_device* dev)
 {
         if (!smu)
                 return -ENODEV;
@@ -669,7 +668,7 @@ static const struct of_device_id smu_platform_match[] =
         {},
 };
 
-static struct of_platform_driver smu_of_platform_driver =
+static struct platform_driver smu_of_platform_driver =
 {
         .driver = {
                 .name = "smu",
@@ -689,7 +688,7 @@ static int __init smu_init_sysfs(void)
          * I'm a bit too far from figuring out how that works with those
          * new chipsets, but that will come back and bite us
          */
-        of_register_platform_driver(&smu_of_platform_driver);
+        platform_driver_register(&smu_of_platform_driver);
         return 0;
 }
 
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index f3a29f264db9..bca2af2e3760 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -2210,7 +2210,7 @@ static void fcu_lookup_fans(struct device_node *fcu_node)
         }
 }
 
-static int fcu_of_probe(struct platform_device* dev, const struct of_device_id *match)
+static int fcu_of_probe(struct platform_device* dev)
 {
         state = state_detached;
         of_dev = dev;
@@ -2240,7 +2240,7 @@ static const struct of_device_id fcu_match[] =
 };
 MODULE_DEVICE_TABLE(of, fcu_match);
 
-static struct of_platform_driver fcu_of_platform_driver = 
+static struct platform_driver fcu_of_platform_driver = 
 {
         .driver = {
                 .name = "temperature",
@@ -2263,12 +2263,12 @@ static int __init therm_pm72_init(void)
             !rackmac)
                 return -ENODEV;
 
-        return of_register_platform_driver(&fcu_of_platform_driver);
+        return platform_driver_register(&fcu_of_platform_driver);
 }
 
 static void __exit therm_pm72_exit(void)
 {
-        of_unregister_platform_driver(&fcu_of_platform_driver);
+        platform_driver_unregister(&fcu_of_platform_driver);
 }
 
 module_init(therm_pm72_init);
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index c89f396e4c53..d37819fd5ad3 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -443,8 +443,7 @@ static struct i2c_driver g4fan_driver = {
 /*      initialization / cleanup                                        */
 /************************************************************************/
 
-static int
-therm_of_probe( struct platform_device *dev, const struct of_device_id *match )
+static int therm_of_probe(struct platform_device *dev)
 {
         return i2c_add_driver( &g4fan_driver );
 }
@@ -462,7 +461,7 @@ static const struct of_device_id therm_of_match[] = {{
     }, {}
 };
 
-static struct of_platform_driver therm_of_driver = {
+static struct platform_driver therm_of_driver = {
         .driver = {
                 .name = "temperature",
                 .owner = THIS_MODULE,
@@ -509,14 +508,14 @@ g4fan_init( void )
                 return -ENODEV;
         }
 
-        of_register_platform_driver( &therm_of_driver );
+        platform_driver_register( &therm_of_driver );
         return 0;
 }
 
 static void __exit
 g4fan_exit( void )
 {
-        of_unregister_platform_driver( &therm_of_driver );
+        platform_driver_unregister( &therm_of_driver );
 
         if( x.of_dev )
                 of_device_unregister( x.of_dev );