Merge branch 'perf/nmi' into perf/core

[firefly-linux-kernel-4.4.55.git] / drivers / macintosh / therm_pm72.c

diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index b18fa948f3d1be64c3f3df73cbc715596fb05de7..e60605bd0ea980a5928d0349df3fdb29eb09bb0c 100644 (file)
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -2215,7 +2215,7 @@ static int fcu_of_probe(struct of_device* dev, const struct of_device_id *match)
        state = state_detached;
 
        /* Lookup the fans in the device tree */
-       fcu_lookup_fans(dev->node);
+       fcu_lookup_fans(dev->dev.of_node);
 
        /* Add the driver */
        return i2c_add_driver(&therm_pm72_driver);
@@ -2238,8 +2238,11 @@ static const struct of_device_id fcu_match[] =
 
 static struct of_platform_driver fcu_of_platform_driver = 
 {
-       .name           = "temperature",
-       .match_table    = fcu_match,
+       .driver = {
+               .name = "temperature",
+               .owner = THIS_MODULE,
+               .of_match_table = fcu_match,
+       },
        .probe          = fcu_of_probe,
        .remove         = fcu_of_remove
 };