@@ -407,57 +407,49 @@ static int da9063_rtc_probe(struct platform_device *pdev)
407
407
config -> rtc_enable_reg ,
408
408
config -> rtc_enable_mask ,
409
409
config -> rtc_enable_mask );
410
- if (ret < 0 ) {
411
- dev_err (& pdev -> dev , "Failed to enable RTC\n" );
412
- return ret ;
413
- }
410
+ if (ret < 0 )
411
+ return dev_err_probe (& pdev -> dev , ret , "Failed to enable RTC\n" );
414
412
415
413
ret = regmap_update_bits (rtc -> regmap ,
416
414
config -> rtc_enable_32k_crystal_reg ,
417
415
config -> rtc_crystal_mask ,
418
416
config -> rtc_crystal_mask );
419
- if (ret < 0 ) {
420
- dev_err (& pdev -> dev , "Failed to run 32kHz oscillator\n" );
421
- return ret ;
422
- }
417
+ if (ret < 0 )
418
+ return dev_err_probe (& pdev -> dev , ret ,
419
+ "Failed to run 32kHz oscillator\n" );
423
420
424
421
ret = regmap_update_bits (rtc -> regmap ,
425
422
config -> rtc_alarm_secs_reg ,
426
423
config -> rtc_alarm_status_mask ,
427
424
0 );
428
- if (ret < 0 ) {
429
- dev_err (& pdev -> dev , "Failed to access RTC alarm register\n" );
430
- return ret ;
431
- }
425
+ if (ret < 0 )
426
+ return dev_err_probe (& pdev -> dev , ret ,
427
+ "Failed to access RTC alarm register\n" );
432
428
433
429
ret = regmap_update_bits (rtc -> regmap ,
434
430
config -> rtc_alarm_secs_reg ,
435
431
DA9063_ALARM_STATUS_ALARM ,
436
432
DA9063_ALARM_STATUS_ALARM );
437
- if (ret < 0 ) {
438
- dev_err (& pdev -> dev , "Failed to access RTC alarm register\n" );
439
- return ret ;
440
- }
433
+ if (ret < 0 )
434
+ return dev_err_probe (& pdev -> dev , ret ,
435
+ "Failed to access RTC alarm register\n" );
441
436
442
437
ret = regmap_update_bits (rtc -> regmap ,
443
438
config -> rtc_alarm_year_reg ,
444
439
config -> rtc_tick_on_mask ,
445
440
0 );
446
- if (ret < 0 ) {
447
- dev_err (& pdev -> dev , "Failed to disable TICKs\n" );
448
- return ret ;
449
- }
441
+ if (ret < 0 )
442
+ return dev_err_probe (& pdev -> dev , ret ,
443
+ "Failed to disable TICKs\n" );
450
444
451
445
data [RTC_SEC ] = 0 ;
452
446
ret = regmap_bulk_read (rtc -> regmap ,
453
447
config -> rtc_alarm_secs_reg ,
454
448
& data [config -> rtc_data_start ],
455
449
config -> rtc_alarm_len );
456
- if (ret < 0 ) {
457
- dev_err (& pdev -> dev , "Failed to read initial alarm data: %d\n" ,
458
- ret );
459
- return ret ;
460
- }
450
+ if (ret < 0 )
451
+ return dev_err_probe (& pdev -> dev , ret ,
452
+ "Failed to read initial alarm data\n" );
461
453
462
454
platform_set_drvdata (pdev , rtc );
463
455
0 commit comments