Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[sfrench/cifs-2.6.git] / drivers / thermal / spear_thermal.c

diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c
index 81b35aace9de0439c4dd76c4c4c0d91597d3b3f3..8b9d567134d01a4aa95afd4981aec0ed7545c5bd 100644 (file)
--- a/drivers/thermal/spear_thermal.c
+++ b/drivers/thermal/spear_thermal.c
@@ -56,8 +56,7 @@ static struct thermal_zone_device_ops ops = {
 
 static int __maybe_unused spear_thermal_suspend(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct thermal_zone_device *spear_thermal = platform_get_drvdata(pdev);
+       struct thermal_zone_device *spear_thermal = dev_get_drvdata(dev);
        struct spear_thermal_dev *stdev = spear_thermal->devdata;
        unsigned int actual_mask = 0;
 
@@ -73,15 +72,14 @@ static int __maybe_unused spear_thermal_suspend(struct device *dev)
 
 static int __maybe_unused spear_thermal_resume(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct thermal_zone_device *spear_thermal = platform_get_drvdata(pdev);
+       struct thermal_zone_device *spear_thermal = dev_get_drvdata(dev);
        struct spear_thermal_dev *stdev = spear_thermal->devdata;
        unsigned int actual_mask = 0;
        int ret = 0;
 
        ret = clk_enable(stdev->clk);
        if (ret) {
-               dev_err(&pdev->dev, "Can't enable clock\n");
+               dev_err(dev, "Can't enable clock\n");
                return ret;
        }