]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
thermal: rockchip_thermal: simplify getting .driver_data
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Sun, 21 Oct 2018 20:00:49 +0000 (22:00 +0200)
committerZhang Rui <rui.zhang@intel.com>
Fri, 30 Nov 2018 08:46:56 +0000 (16:46 +0800)
We should get 'driver_data' from 'struct device' directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
drivers/thermal/rockchip_thermal.c

index f36375d5a16c57dae499820522accbe979101db8..9c7643d62ed70782e35a7807f90692e9c47670b2 100644 (file)
@@ -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);
        }