History

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal

Pull last minute thermal-SoC management fixes from Eduardo Valentin: "Specifics: - Minor fixes on ST and RCAR thermal drivers. - Avoid flooding kernel log when driver returns -EAGAIN. Note: I am sending this pull on Rui's behalf while he fixes issues in his Linux box" * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal: drivers: thermal: st: remove several sparse warnings thermal: constify of_device_id array thermal: Do not log an error if thermal_zone_get_temp returns -EAGAIN thermal: rcar: Fix typo in r8a73a4 SoC name

Linus Torvalds committed 11 years ago

Commit 54d8ccc2 parents 56fd85b 541d5295 files · +18 −16Browse files

Unified · Split

5 files
  1. Documentation/devicetree/bindings/thermal/rcar-thermal.txt +1 −1
  2. drivers/thermal/st/st_thermal.c +1 −1
  3. drivers/thermal/st/st_thermal_memmap.c +5 −5
  4. drivers/thermal/st/st_thermal_syscfg.c +7 −7
  5. drivers/thermal/thermal_core.c +4 −2
Documentation/devicetree/bindings/thermal/rcar-thermal.txt+1−1
@@ -4,7 +4,7 @@ Required properties: · 3 unmodified lines
4- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal"4- compatible : "renesas,thermal-<soctype>", "renesas,rcar-thermal"
5 as fallback.5 as fallback.
6 Examples with soctypes are:6 Examples with soctypes are:
7 - "renesas,thermal-r8a73a4" (R-Mobile AP6)7 - "renesas,thermal-r8a73a4" (R-Mobile APE6)
8 - "renesas,thermal-r8a7779" (R-Car H1)8 - "renesas,thermal-r8a7779" (R-Car H1)
9 - "renesas,thermal-r8a7790" (R-Car H2)9 - "renesas,thermal-r8a7790" (R-Car H2)
10 - "renesas,thermal-r8a7791" (R-Car M2-W)10 - "renesas,thermal-r8a7791" (R-Car M2-W)
drivers/thermal/st/st_thermal.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
25 * Function to allocate regfields which are common25 * Function to allocate regfields which are common
26 * between syscfg and memory mapped based sensors26 * between syscfg and memory mapped based sensors
27 */27 */
28int st_thermal_alloc_regfields(struct st_thermal_sensor *sensor)28static int st_thermal_alloc_regfields(struct st_thermal_sensor *sensor)
29{29{
30 struct device *dev = sensor->dev;30 struct device *dev = sensor->dev;
31 struct regmap *regmap = sensor->regmap;31 struct regmap *regmap = sensor->regmap;
drivers/thermal/st/st_thermal_memmap.c+5−5
@@ -157,7 +157,7 @@ static const struct st_thermal_sensor_ops st_mmap_sensor_ops = { · 156 unmodified lines
157};157};
158 158
159/* Compatible device data stih416 mpe thermal sensor */159/* Compatible device data stih416 mpe thermal sensor */
160const struct st_thermal_compat_data st_416mpe_cdata = {160static const struct st_thermal_compat_data st_416mpe_cdata = {
161 .reg_fields = st_mmap_thermal_regfields,161 .reg_fields = st_mmap_thermal_regfields,
162 .ops = &st_mmap_sensor_ops,162 .ops = &st_mmap_sensor_ops,
163 .calibration_val = 14,163 .calibration_val = 14,
@@ -166,7 +166,7 @@ const struct st_thermal_compat_data st_416mpe_cdata = { · 2 unmodified lines
166};166};
167 167
168/* Compatible device data stih407 thermal sensor */168/* Compatible device data stih407 thermal sensor */
169const struct st_thermal_compat_data st_407_cdata = {169static const struct st_thermal_compat_data st_407_cdata = {
170 .reg_fields = st_mmap_thermal_regfields,170 .reg_fields = st_mmap_thermal_regfields,
171 .ops = &st_mmap_sensor_ops,171 .ops = &st_mmap_sensor_ops,
172 .calibration_val = 16,172 .calibration_val = 16,
@@ -174,19 +174,19 @@ const struct st_thermal_compat_data st_407_cdata = { · 1 unmodified line
174 .crit_temp = 120,174 .crit_temp = 120,
175};175};
176 176
177static struct of_device_id st_mmap_thermal_of_match[] = {177static const struct of_device_id st_mmap_thermal_of_match[] = {
178 { .compatible = "st,stih416-mpe-thermal", .data = &st_416mpe_cdata },178 { .compatible = "st,stih416-mpe-thermal", .data = &st_416mpe_cdata },
179 { .compatible = "st,stih407-thermal", .data = &st_407_cdata },179 { .compatible = "st,stih407-thermal", .data = &st_407_cdata },
180 { /* sentinel */ }180 { /* sentinel */ }
181};181};
182MODULE_DEVICE_TABLE(of, st_mmap_thermal_of_match);182MODULE_DEVICE_TABLE(of, st_mmap_thermal_of_match);
183 183
184int st_mmap_probe(struct platform_device *pdev)184static int st_mmap_probe(struct platform_device *pdev)
185{185{
186 return st_thermal_register(pdev, st_mmap_thermal_of_match);186 return st_thermal_register(pdev, st_mmap_thermal_of_match);
187}187}
188 188
189int st_mmap_remove(struct platform_device *pdev)189static int st_mmap_remove(struct platform_device *pdev)
190{190{
191 return st_thermal_unregister(pdev);191 return st_thermal_unregister(pdev);
192}192}
drivers/thermal/st/st_thermal_syscfg.c+7−7
@@ -104,7 +104,7 @@ static const struct st_thermal_sensor_ops st_syscfg_sensor_ops = { · 103 unmodified lines
104};104};
105 105
106/* Compatible device data for stih415 sas thermal sensor */106/* Compatible device data for stih415 sas thermal sensor */
107const struct st_thermal_compat_data st_415sas_cdata = {107static const struct st_thermal_compat_data st_415sas_cdata = {
108 .sys_compat = "st,stih415-front-syscfg",108 .sys_compat = "st,stih415-front-syscfg",
109 .reg_fields = st_415sas_regfields,109 .reg_fields = st_415sas_regfields,
110 .ops = &st_syscfg_sensor_ops,110 .ops = &st_syscfg_sensor_ops,
@@ -114,7 +114,7 @@ const struct st_thermal_compat_data st_415sas_cdata = { · 3 unmodified lines
114};114};
115 115
116/* Compatible device data for stih415 mpe thermal sensor */116/* Compatible device data for stih415 mpe thermal sensor */
117const struct st_thermal_compat_data st_415mpe_cdata = {117static const struct st_thermal_compat_data st_415mpe_cdata = {
118 .sys_compat = "st,stih415-system-syscfg",118 .sys_compat = "st,stih415-system-syscfg",
119 .reg_fields = st_415mpe_regfields,119 .reg_fields = st_415mpe_regfields,
120 .ops = &st_syscfg_sensor_ops,120 .ops = &st_syscfg_sensor_ops,
@@ -124,7 +124,7 @@ const struct st_thermal_compat_data st_415mpe_cdata = { · 3 unmodified lines
124};124};
125 125
126/* Compatible device data for stih416 sas thermal sensor */126/* Compatible device data for stih416 sas thermal sensor */
127const struct st_thermal_compat_data st_416sas_cdata = {127static const struct st_thermal_compat_data st_416sas_cdata = {
128 .sys_compat = "st,stih416-front-syscfg",128 .sys_compat = "st,stih416-front-syscfg",
129 .reg_fields = st_416sas_regfields,129 .reg_fields = st_416sas_regfields,
130 .ops = &st_syscfg_sensor_ops,130 .ops = &st_syscfg_sensor_ops,
@@ -134,7 +134,7 @@ const struct st_thermal_compat_data st_416sas_cdata = { · 3 unmodified lines
134};134};
135 135
136/* Compatible device data for stid127 thermal sensor */136/* Compatible device data for stid127 thermal sensor */
137const struct st_thermal_compat_data st_127_cdata = {137static const struct st_thermal_compat_data st_127_cdata = {
138 .sys_compat = "st,stid127-cpu-syscfg",138 .sys_compat = "st,stid127-cpu-syscfg",
139 .reg_fields = st_127_regfields,139 .reg_fields = st_127_regfields,
140 .ops = &st_syscfg_sensor_ops,140 .ops = &st_syscfg_sensor_ops,
@@ -143,7 +143,7 @@ const struct st_thermal_compat_data st_127_cdata = { · 2 unmodified lines
143 .crit_temp = 120,143 .crit_temp = 120,
144};144};
145 145
146static struct of_device_id st_syscfg_thermal_of_match[] = {146static const struct of_device_id st_syscfg_thermal_of_match[] = {
147 { .compatible = "st,stih415-sas-thermal", .data = &st_415sas_cdata },147 { .compatible = "st,stih415-sas-thermal", .data = &st_415sas_cdata },
148 { .compatible = "st,stih415-mpe-thermal", .data = &st_415mpe_cdata },148 { .compatible = "st,stih415-mpe-thermal", .data = &st_415mpe_cdata },
149 { .compatible = "st,stih416-sas-thermal", .data = &st_416sas_cdata },149 { .compatible = "st,stih416-sas-thermal", .data = &st_416sas_cdata },
@@ -152,12 +152,12 @@ static struct of_device_id st_syscfg_thermal_of_match[] = { · 2 unmodified lines
152};152};
153MODULE_DEVICE_TABLE(of, st_syscfg_thermal_of_match);153MODULE_DEVICE_TABLE(of, st_syscfg_thermal_of_match);
154 154
155int st_syscfg_probe(struct platform_device *pdev)155static int st_syscfg_probe(struct platform_device *pdev)
156{156{
157 return st_thermal_register(pdev, st_syscfg_thermal_of_match);157 return st_thermal_register(pdev, st_syscfg_thermal_of_match);
158}158}
159 159
160int st_syscfg_remove(struct platform_device *pdev)160static int st_syscfg_remove(struct platform_device *pdev)
161{161{
162 return st_thermal_unregister(pdev);162 return st_thermal_unregister(pdev);
163}163}
drivers/thermal/thermal_core.c+4−2
@@ -458,8 +458,10 @@ static void update_temperature(struct thermal_zone_device *tz) · 457 unmodified lines
458 458
459 ret = thermal_zone_get_temp(tz, &temp);459 ret = thermal_zone_get_temp(tz, &temp);
460 if (ret) {460 if (ret) {
461 dev_warn(&tz->device, "failed to read out thermal zone %d\n",461 if (ret != -EAGAIN)
462 tz->id);462 dev_warn(&tz->device,
463 "failed to read out thermal zone (%d)\n",
464 ret);
463 return;465 return;
464 }466 }
465 467