@@ -1037,17 +1037,14 @@ static int exynos_tmu_probe(struct platform_device *pdev)
1037
1037
return ret ;
1038
1038
1039
1039
data -> clk = devm_clk_get (dev , "tmu_apbif" );
1040
- if (IS_ERR (data -> clk )) {
1041
- dev_err (dev , "Failed to get clock\n" );
1042
- return PTR_ERR (data -> clk );
1043
- }
1040
+ if (IS_ERR (data -> clk ))
1041
+ return dev_err_probe (dev , PTR_ERR (data -> clk ), "Failed to get clock\n" );
1044
1042
1045
1043
data -> clk_sec = devm_clk_get (dev , "tmu_triminfo_apbif" );
1046
1044
if (IS_ERR (data -> clk_sec )) {
1047
- if (data -> soc == SOC_ARCH_EXYNOS5420_TRIMINFO ) {
1048
- dev_err (dev , "Failed to get triminfo clock\n" );
1049
- return PTR_ERR (data -> clk_sec );
1050
- }
1045
+ if (data -> soc == SOC_ARCH_EXYNOS5420_TRIMINFO )
1046
+ return dev_err_probe (dev , PTR_ERR (data -> clk_sec ),
1047
+ "Failed to get triminfo clock\n" );
1051
1048
} else {
1052
1049
ret = clk_prepare (data -> clk_sec );
1053
1050
if (ret ) {
@@ -1067,8 +1064,7 @@ static int exynos_tmu_probe(struct platform_device *pdev)
1067
1064
case SOC_ARCH_EXYNOS7 :
1068
1065
data -> sclk = devm_clk_get (dev , "tmu_sclk" );
1069
1066
if (IS_ERR (data -> sclk )) {
1070
- dev_err (dev , "Failed to get sclk\n" );
1071
- ret = PTR_ERR (data -> sclk );
1067
+ ret = dev_err_probe (dev , PTR_ERR (data -> sclk ), "Failed to get sclk\n" );
1072
1068
goto err_clk ;
1073
1069
} else {
1074
1070
ret = clk_prepare_enable (data -> sclk );
@@ -1091,9 +1087,7 @@ static int exynos_tmu_probe(struct platform_device *pdev)
1091
1087
data -> tzd = devm_thermal_of_zone_register (dev , 0 , data ,
1092
1088
& exynos_sensor_ops );
1093
1089
if (IS_ERR (data -> tzd )) {
1094
- ret = PTR_ERR (data -> tzd );
1095
- if (ret != - EPROBE_DEFER )
1096
- dev_err (dev , "Failed to register sensor: %d\n" , ret );
1090
+ ret = dev_err_probe (dev , PTR_ERR (data -> tzd ), "Failed to register sensor\n" );
1097
1091
goto err_sclk ;
1098
1092
}
1099
1093
0 commit comments