From: Zhang Rui <rui.zhang@intel.com>
Date: Wed, 22 Feb 2017 07:35:06 +0000 (+0800)
Subject: Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6fefe19f583625ca4ea3ecc9128baa51c31c60a4;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion' into next
---

6fefe19f583625ca4ea3ecc9128baa51c31c60a4
diff --cc drivers/thermal/thermal_core.c
index 655591316a88,655591316a88,655591316a88,f2a0cd119e22..11f0675cb7e5
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@@@@ -1313,10 -1313,10 -1313,10 -1287,15 +1292,10 @@@@@ void thermal_zone_device_unregister(str
    	thermal_set_governor(tz, NULL);
    
    	thermal_remove_hwmon_sysfs(tz);
--- 	release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
--- 	idr_destroy(&tz->idr);
+++ 	ida_simple_remove(&thermal_tz_ida, tz->id);
+++ 	ida_destroy(&tz->ida);
    	mutex_destroy(&tz->lock);
    	device_unregister(&tz->device);
   -	kfree(tz->device.groups);
    }
    EXPORT_SYMBOL_GPL(thermal_zone_device_unregister);