Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[mirror_ubuntu-zesty-kernel.git] / drivers / hwmon / smsc47m1.c

diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index 6d8255ccf07afb1a9d31955f82e91392a824a4ba..05cb814539cb609d42e7bd9bc84abe178cb6b7a7 100644 (file)
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -668,7 +668,7 @@ static void smsc47m1_remove_files(struct device *dev)
 static int __init smsc47m1_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
-       struct smsc47m1_sio_data *sio_data = dev->platform_data;
+       struct smsc47m1_sio_data *sio_data = dev_get_platdata(dev);
        struct smsc47m1_data *data;
        struct resource *res;
        int err;
@@ -940,7 +940,7 @@ exit_device:
 static void __exit sm_smsc47m1_exit(void)
 {
        platform_driver_unregister(&smsc47m1_driver);
-       smsc47m1_restore(pdev->dev.platform_data);
+       smsc47m1_restore(dev_get_platdata(&pdev->dev));
        platform_device_unregister(pdev);
 }