Skip to content

Commit eeaa762

Browse files
committed
Merge tag 'hwmon-for-v5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck: - Fix up chip IDs (isl68137) - error handling for invalid temperatures and use true module name (drivetemp) - Fix static symbol warnings (k10temp) - Use valid hwmon device name (jc42) * tag 'hwmon-for-v5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (jc42) Fix name to have no illegal characters hwmon: (k10temp) make some symbols static hwmon: (drivetemp) Return -ENODATA for invalid temperatures hwmon: (drivetemp) Use drivetemp's true module name in Kconfig section hwmon: (pmbus/isl68137) Fix up chip IDs
2 parents c0d73a8 + c843b38 commit eeaa762

File tree

6 files changed

+134
-50
lines changed

6 files changed

+134
-50
lines changed

Documentation/hwmon/isl68137.rst

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Supported chips:
1616

1717
* Renesas ISL68220
1818

19-
Prefix: 'raa_dmpvr2_2rail'
19+
Prefix: 'isl68220'
2020

2121
Addresses scanned: -
2222

@@ -26,7 +26,7 @@ Supported chips:
2626

2727
* Renesas ISL68221
2828

29-
Prefix: 'raa_dmpvr2_3rail'
29+
Prefix: 'isl68221'
3030

3131
Addresses scanned: -
3232

@@ -36,7 +36,7 @@ Supported chips:
3636

3737
* Renesas ISL68222
3838

39-
Prefix: 'raa_dmpvr2_2rail'
39+
Prefix: 'isl68222'
4040

4141
Addresses scanned: -
4242

@@ -46,7 +46,7 @@ Supported chips:
4646

4747
* Renesas ISL68223
4848

49-
Prefix: 'raa_dmpvr2_2rail'
49+
Prefix: 'isl68223'
5050

5151
Addresses scanned: -
5252

@@ -56,7 +56,7 @@ Supported chips:
5656

5757
* Renesas ISL68224
5858

59-
Prefix: 'raa_dmpvr2_3rail'
59+
Prefix: 'isl68224'
6060

6161
Addresses scanned: -
6262

@@ -66,7 +66,7 @@ Supported chips:
6666

6767
* Renesas ISL68225
6868

69-
Prefix: 'raa_dmpvr2_2rail'
69+
Prefix: 'isl68225'
7070

7171
Addresses scanned: -
7272

@@ -76,7 +76,7 @@ Supported chips:
7676

7777
* Renesas ISL68226
7878

79-
Prefix: 'raa_dmpvr2_3rail'
79+
Prefix: 'isl68226'
8080

8181
Addresses scanned: -
8282

@@ -86,7 +86,7 @@ Supported chips:
8686

8787
* Renesas ISL68227
8888

89-
Prefix: 'raa_dmpvr2_1rail'
89+
Prefix: 'isl68227'
9090

9191
Addresses scanned: -
9292

@@ -96,7 +96,7 @@ Supported chips:
9696

9797
* Renesas ISL68229
9898

99-
Prefix: 'raa_dmpvr2_3rail'
99+
Prefix: 'isl68229'
100100

101101
Addresses scanned: -
102102

@@ -106,7 +106,7 @@ Supported chips:
106106

107107
* Renesas ISL68233
108108

109-
Prefix: 'raa_dmpvr2_2rail'
109+
Prefix: 'isl68233'
110110

111111
Addresses scanned: -
112112

@@ -116,7 +116,7 @@ Supported chips:
116116

117117
* Renesas ISL68239
118118

119-
Prefix: 'raa_dmpvr2_3rail'
119+
Prefix: 'isl68239'
120120

121121
Addresses scanned: -
122122

@@ -126,7 +126,7 @@ Supported chips:
126126

127127
* Renesas ISL69222
128128

129-
Prefix: 'raa_dmpvr2_2rail'
129+
Prefix: 'isl69222'
130130

131131
Addresses scanned: -
132132

@@ -136,7 +136,7 @@ Supported chips:
136136

137137
* Renesas ISL69223
138138

139-
Prefix: 'raa_dmpvr2_3rail'
139+
Prefix: 'isl69223'
140140

141141
Addresses scanned: -
142142

@@ -146,7 +146,7 @@ Supported chips:
146146

147147
* Renesas ISL69224
148148

149-
Prefix: 'raa_dmpvr2_2rail'
149+
Prefix: 'isl69224'
150150

151151
Addresses scanned: -
152152

@@ -156,7 +156,7 @@ Supported chips:
156156

157157
* Renesas ISL69225
158158

159-
Prefix: 'raa_dmpvr2_2rail'
159+
Prefix: 'isl69225'
160160

161161
Addresses scanned: -
162162

@@ -166,7 +166,7 @@ Supported chips:
166166

167167
* Renesas ISL69227
168168

169-
Prefix: 'raa_dmpvr2_3rail'
169+
Prefix: 'isl69227'
170170

171171
Addresses scanned: -
172172

@@ -176,7 +176,7 @@ Supported chips:
176176

177177
* Renesas ISL69228
178178

179-
Prefix: 'raa_dmpvr2_3rail'
179+
Prefix: 'isl69228'
180180

181181
Addresses scanned: -
182182

@@ -186,7 +186,7 @@ Supported chips:
186186

187187
* Renesas ISL69234
188188

189-
Prefix: 'raa_dmpvr2_2rail'
189+
Prefix: 'isl69234'
190190

191191
Addresses scanned: -
192192

@@ -196,7 +196,7 @@ Supported chips:
196196

197197
* Renesas ISL69236
198198

199-
Prefix: 'raa_dmpvr2_2rail'
199+
Prefix: 'isl69236'
200200

201201
Addresses scanned: -
202202

@@ -206,7 +206,7 @@ Supported chips:
206206

207207
* Renesas ISL69239
208208

209-
Prefix: 'raa_dmpvr2_3rail'
209+
Prefix: 'isl69239'
210210

211211
Addresses scanned: -
212212

@@ -216,7 +216,7 @@ Supported chips:
216216

217217
* Renesas ISL69242
218218

219-
Prefix: 'raa_dmpvr2_2rail'
219+
Prefix: 'isl69242'
220220

221221
Addresses scanned: -
222222

@@ -226,7 +226,7 @@ Supported chips:
226226

227227
* Renesas ISL69243
228228

229-
Prefix: 'raa_dmpvr2_1rail'
229+
Prefix: 'isl69243'
230230

231231
Addresses scanned: -
232232

@@ -236,7 +236,7 @@ Supported chips:
236236

237237
* Renesas ISL69247
238238

239-
Prefix: 'raa_dmpvr2_2rail'
239+
Prefix: 'isl69247'
240240

241241
Addresses scanned: -
242242

@@ -246,7 +246,7 @@ Supported chips:
246246

247247
* Renesas ISL69248
248248

249-
Prefix: 'raa_dmpvr2_2rail'
249+
Prefix: 'isl69248'
250250

251251
Addresses scanned: -
252252

@@ -256,7 +256,7 @@ Supported chips:
256256

257257
* Renesas ISL69254
258258

259-
Prefix: 'raa_dmpvr2_2rail'
259+
Prefix: 'isl69254'
260260

261261
Addresses scanned: -
262262

@@ -266,7 +266,7 @@ Supported chips:
266266

267267
* Renesas ISL69255
268268

269-
Prefix: 'raa_dmpvr2_2rail'
269+
Prefix: 'isl69255'
270270

271271
Addresses scanned: -
272272

@@ -276,7 +276,7 @@ Supported chips:
276276

277277
* Renesas ISL69256
278278

279-
Prefix: 'raa_dmpvr2_2rail'
279+
Prefix: 'isl69256'
280280

281281
Addresses scanned: -
282282

@@ -286,7 +286,7 @@ Supported chips:
286286

287287
* Renesas ISL69259
288288

289-
Prefix: 'raa_dmpvr2_2rail'
289+
Prefix: 'isl69259'
290290

291291
Addresses scanned: -
292292

@@ -296,7 +296,7 @@ Supported chips:
296296

297297
* Renesas ISL69260
298298

299-
Prefix: 'raa_dmpvr2_2rail'
299+
Prefix: 'isl69260'
300300

301301
Addresses scanned: -
302302

@@ -306,7 +306,7 @@ Supported chips:
306306

307307
* Renesas ISL69268
308308

309-
Prefix: 'raa_dmpvr2_2rail'
309+
Prefix: 'isl69268'
310310

311311
Addresses scanned: -
312312

@@ -316,7 +316,7 @@ Supported chips:
316316

317317
* Renesas ISL69269
318318

319-
Prefix: 'raa_dmpvr2_3rail'
319+
Prefix: 'isl69269'
320320

321321
Addresses scanned: -
322322

@@ -326,7 +326,7 @@ Supported chips:
326326

327327
* Renesas ISL69298
328328

329-
Prefix: 'raa_dmpvr2_2rail'
329+
Prefix: 'isl69298'
330330

331331
Addresses scanned: -
332332

@@ -336,7 +336,7 @@ Supported chips:
336336

337337
* Renesas RAA228000
338338

339-
Prefix: 'raa_dmpvr2_hv'
339+
Prefix: 'raa228000'
340340

341341
Addresses scanned: -
342342

@@ -346,7 +346,7 @@ Supported chips:
346346

347347
* Renesas RAA228004
348348

349-
Prefix: 'raa_dmpvr2_hv'
349+
Prefix: 'raa228004'
350350

351351
Addresses scanned: -
352352

@@ -356,7 +356,7 @@ Supported chips:
356356

357357
* Renesas RAA228006
358358

359-
Prefix: 'raa_dmpvr2_hv'
359+
Prefix: 'raa228006'
360360

361361
Addresses scanned: -
362362

@@ -366,7 +366,7 @@ Supported chips:
366366

367367
* Renesas RAA228228
368368

369-
Prefix: 'raa_dmpvr2_2rail'
369+
Prefix: 'raa228228'
370370

371371
Addresses scanned: -
372372

@@ -376,7 +376,7 @@ Supported chips:
376376

377377
* Renesas RAA229001
378378

379-
Prefix: 'raa_dmpvr2_2rail'
379+
Prefix: 'raa229001'
380380

381381
Addresses scanned: -
382382

@@ -386,7 +386,7 @@ Supported chips:
386386

387387
* Renesas RAA229004
388388

389-
Prefix: 'raa_dmpvr2_2rail'
389+
Prefix: 'raa229004'
390390

391391
Addresses scanned: -
392392

drivers/hwmon/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ config SENSORS_DRIVETEMP
412412
hard disk drives.
413413

414414
This driver can also be built as a module. If so, the module
415-
will be called satatemp.
415+
will be called drivetemp.
416416

417417
config SENSORS_DS620
418418
tristate "Dallas Semiconductor DS620"

drivers/hwmon/drivetemp.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,12 +264,18 @@ static int drivetemp_get_scttemp(struct drivetemp_data *st, u32 attr, long *val)
264264
return err;
265265
switch (attr) {
266266
case hwmon_temp_input:
267+
if (!temp_is_valid(buf[SCT_STATUS_TEMP]))
268+
return -ENODATA;
267269
*val = temp_from_sct(buf[SCT_STATUS_TEMP]);
268270
break;
269271
case hwmon_temp_lowest:
272+
if (!temp_is_valid(buf[SCT_STATUS_TEMP_LOWEST]))
273+
return -ENODATA;
270274
*val = temp_from_sct(buf[SCT_STATUS_TEMP_LOWEST]);
271275
break;
272276
case hwmon_temp_highest:
277+
if (!temp_is_valid(buf[SCT_STATUS_TEMP_HIGHEST]))
278+
return -ENODATA;
273279
*val = temp_from_sct(buf[SCT_STATUS_TEMP_HIGHEST]);
274280
break;
275281
default:

drivers/hwmon/jc42.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ static int jc42_probe(struct i2c_client *client, const struct i2c_device_id *id)
506506
}
507507
data->config = config;
508508

509-
hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name,
509+
hwmon_dev = devm_hwmon_device_register_with_info(dev, "jc42",
510510
data, &jc42_chip_info,
511511
NULL);
512512
return PTR_ERR_OR_ZERO(hwmon_dev);

0 commit comments

Comments
 (0)