Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-microblaze.git] / drivers / thermal / rockchip_thermal.c

diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index f36375d..9c7643d 100644 (file)
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -1327,8 +1327,7 @@ static int rockchip_thermal_remove(struct platform_device *pdev)
 
 static int __maybe_unused rockchip_thermal_suspend(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct rockchip_thermal_data *thermal = platform_get_drvdata(pdev);
+       struct rockchip_thermal_data *thermal = dev_get_drvdata(dev);
        int i;
 
        for (i = 0; i < thermal->chip->chn_num; i++)
@@ -1346,8 +1345,7 @@ static int __maybe_unused rockchip_thermal_suspend(struct device *dev)
 
 static int __maybe_unused rockchip_thermal_resume(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct rockchip_thermal_data *thermal = platform_get_drvdata(pdev);
+       struct rockchip_thermal_data *thermal = dev_get_drvdata(dev);
        int i;
        int error;
 
@@ -1376,7 +1374,7 @@ static int __maybe_unused rockchip_thermal_resume(struct device *dev)
                                              id, thermal->regs,
                                              thermal->tshut_temp);
                if (error)
-                       dev_err(&pdev->dev, "%s: invalid tshut=%d, error=%d\n",
+                       dev_err(dev, "%s: invalid tshut=%d, error=%d\n",
                                __func__, thermal->tshut_temp, error);
        }