@@ -411,22 +411,19 @@ static int qpnp_tm_probe(struct platform_device *pdev)
411
411
chip -> base = res ;
412
412
413
413
ret = qpnp_tm_read (chip , QPNP_TM_REG_TYPE , & type );
414
- if (ret < 0 ) {
415
- dev_err (& pdev -> dev , "could not read type\n" );
416
- return ret ;
417
- }
414
+ if (ret < 0 )
415
+ return dev_err_probe (& pdev -> dev , ret ,
416
+ "could not read type\n" );
418
417
419
418
ret = qpnp_tm_read (chip , QPNP_TM_REG_SUBTYPE , & subtype );
420
- if (ret < 0 ) {
421
- dev_err (& pdev -> dev , "could not read subtype\n" );
422
- return ret ;
423
- }
419
+ if (ret < 0 )
420
+ return dev_err_probe (& pdev -> dev , ret ,
421
+ "could not read subtype\n" );
424
422
425
423
ret = qpnp_tm_read (chip , QPNP_TM_REG_DIG_MAJOR , & dig_major );
426
- if (ret < 0 ) {
427
- dev_err (& pdev -> dev , "could not read dig_major\n" );
428
- return ret ;
429
- }
424
+ if (ret < 0 )
425
+ return dev_err_probe (& pdev -> dev , ret ,
426
+ "could not read dig_major\n" );
430
427
431
428
if (type != QPNP_TM_TYPE || (subtype != QPNP_TM_SUBTYPE_GEN1
432
429
&& subtype != QPNP_TM_SUBTYPE_GEN2 )) {
@@ -448,16 +445,13 @@ static int qpnp_tm_probe(struct platform_device *pdev)
448
445
*/
449
446
chip -> tz_dev = devm_thermal_of_zone_register (
450
447
& pdev -> dev , 0 , chip , & qpnp_tm_sensor_ops );
451
- if (IS_ERR (chip -> tz_dev )) {
452
- dev_err (& pdev -> dev , "failed to register sensor\n" );
453
- return PTR_ERR (chip -> tz_dev );
454
- }
448
+ if (IS_ERR (chip -> tz_dev ))
449
+ return dev_err_probe (& pdev -> dev , PTR_ERR (chip -> tz_dev ),
450
+ "failed to register sensor\n" );
455
451
456
452
ret = qpnp_tm_init (chip );
457
- if (ret < 0 ) {
458
- dev_err (& pdev -> dev , "init failed\n" );
459
- return ret ;
460
- }
453
+ if (ret < 0 )
454
+ return dev_err_probe (& pdev -> dev , ret , "init failed\n" );
461
455
462
456
devm_thermal_add_hwmon_sysfs (& pdev -> dev , chip -> tz_dev );
463
457
0 commit comments