Merge branches 'misc', 'drv_cleanup', 'devm-cleanup' and 'ti-soc' of .git into next

[karo-tx-linux.git] / drivers / thermal / spear_thermal.c

diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c
index 0f37c7279c968a80d8042c95a965b69796d30b35..ab79ea4701d9f88df85b693c41f96a7d80faaea8 100644 (file)
--- a/drivers/thermal/spear_thermal.c
+++ b/drivers/thermal/spear_thermal.c
@@ -167,7 +167,6 @@ static int spear_thermal_exit(struct platform_device *pdev)
        struct spear_thermal_dev *stdev = spear_thermal->devdata;
 
        thermal_zone_device_unregister(spear_thermal);
-       platform_set_drvdata(pdev, NULL);
 
        /* Disable SPEAr Thermal Sensor */
        actual_mask = readl_relaxed(stdev->thermal_base);
@@ -191,7 +190,7 @@ static struct platform_driver spear_thermal_driver = {
                .name = "spear_thermal",
                .owner = THIS_MODULE,
                .pm = &spear_thermal_pm_ops,
-               .of_match_table = of_match_ptr(spear_thermal_id_table),
+               .of_match_table = spear_thermal_id_table,
        },
 };