Skip to content

Commit f5334aa

Browse files
bijudasalexandrebelloni
authored andcommitted
rtc: da9063: Use dev_err_probe()
Replace dev_err()->dev_err_probe() to simpilfy probe(). Signed-off-by: Biju Das <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexandre Belloni <[email protected]>
1 parent 4b60c32 commit f5334aa

File tree

1 file changed

+17
-25
lines changed

1 file changed

+17
-25
lines changed

drivers/rtc/rtc-da9063.c

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -407,57 +407,49 @@ static int da9063_rtc_probe(struct platform_device *pdev)
407407
config->rtc_enable_reg,
408408
config->rtc_enable_mask,
409409
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");
414412

415413
ret = regmap_update_bits(rtc->regmap,
416414
config->rtc_enable_32k_crystal_reg,
417415
config->rtc_crystal_mask,
418416
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");
423420

424421
ret = regmap_update_bits(rtc->regmap,
425422
config->rtc_alarm_secs_reg,
426423
config->rtc_alarm_status_mask,
427424
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");
432428

433429
ret = regmap_update_bits(rtc->regmap,
434430
config->rtc_alarm_secs_reg,
435431
DA9063_ALARM_STATUS_ALARM,
436432
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");
441436

442437
ret = regmap_update_bits(rtc->regmap,
443438
config->rtc_alarm_year_reg,
444439
config->rtc_tick_on_mask,
445440
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");
450444

451445
data[RTC_SEC] = 0;
452446
ret = regmap_bulk_read(rtc->regmap,
453447
config->rtc_alarm_secs_reg,
454448
&data[config->rtc_data_start],
455449
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");
461453

462454
platform_set_drvdata(pdev, rtc);
463455

0 commit comments

Comments
 (0)