1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c
index d863e13a50b8..27a62711e0a6 100644
--- a/drivers/hwmon/ultra45_env.c
+++ b/drivers/hwmon/ultra45_env.c
@@ -234,8 +234,7 @@ static const struct attribute_group env_group = {
         .attrs = env_attributes,
 };
 
-static int __devinit env_probe(struct platform_device *op,
-                               const struct of_device_id *match)
+static int __devinit env_probe(struct platform_device *op)
 {
         struct env *p = kzalloc(sizeof(*p), GFP_KERNEL);
         int err = -ENOMEM;
@@ -259,7 +258,7 @@ static int __devinit env_probe(struct platform_device *op,
                 goto out_sysfs_remove_group;
         }
 
-        dev_set_drvdata(&op->dev, p);
+        platform_set_drvdata(op, p);
         err = 0;
 
 out:
@@ -278,7 +277,7 @@ out_free:
 
 static int __devexit env_remove(struct platform_device *op)
 {
-        struct env *p = dev_get_drvdata(&op->dev);
+        struct env *p = platform_get_drvdata(op);
 
         if (p) {
                 sysfs_remove_group(&op->dev.kobj, &env_group);
@@ -299,7 +298,7 @@ static const struct of_device_id env_match[] = {
 };
 MODULE_DEVICE_TABLE(of, env_match);
 
-static struct of_platform_driver env_driver = {
+static struct platform_driver env_driver = {
         .driver = {
                 .name = "ultra45_env",
                 .owner = THIS_MODULE,
@@ -311,12 +310,12 @@ static struct of_platform_driver env_driver = {
 
 static int __init env_init(void)
 {
-        return of_register_platform_driver(&env_driver);
+        return platform_driver_register(&env_driver);
 }
 
 static void __exit env_exit(void)
 {
-        of_unregister_platform_driver(&env_driver);
+        platform_driver_unregister(&env_driver);
 }
 
 module_init(env_init);