Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / drivers / hwmon / ultra45_env.c

diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c
index 1f36c635d93341727c26976daedcd0c953e5b6ad..27a62711e0a6170c4d32fa1c608660af761b9a48 100644 (file)
--- a/drivers/hwmon/ultra45_env.c
+++ b/drivers/hwmon/ultra45_env.c
@@ -258,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:
@@ -277,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);