projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UPSTREAM: thermal: rockchip: improve the warning log
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
thermal
/
rockchip_thermal.c
diff --git
a/drivers/thermal/rockchip_thermal.c
b/drivers/thermal/rockchip_thermal.c
index 357d967fc71fa4c679ebaddf49926d543827a062..fb68b748a6b0405b94e2da10f74817f06c803b8d 100644
(file)
--- a/
drivers/thermal/rockchip_thermal.c
+++ b/
drivers/thermal/rockchip_thermal.c
@@
-525,11
+525,6
@@
static void rk_tsadcv2_initialize(struct regmap *grf, void __iomem *regs,
regs + TSADCV2_AUTO_PERIOD_HT);
writel_relaxed(TSADCV2_HIGHT_TSHUT_DEBOUNCE_COUNT,
regs + TSADCV2_HIGHT_TSHUT_DEBOUNCE);
regs + TSADCV2_AUTO_PERIOD_HT);
writel_relaxed(TSADCV2_HIGHT_TSHUT_DEBOUNCE_COUNT,
regs + TSADCV2_HIGHT_TSHUT_DEBOUNCE);
-
- if (IS_ERR(grf)) {
- pr_warn("%s: Missing rockchip,grf property\n", __func__);
- return;
- }
}
/**
}
/**
@@
-969,6
+964,8
@@
static int rockchip_configure_from_dt(struct device *dev,
* need this property.
*/
thermal->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
* need this property.
*/
thermal->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
+ if (IS_ERR(thermal->grf))
+ dev_warn(dev, "Missing rockchip,grf property\n");
return 0;
}
return 0;
}