@@ -1040,38 +1040,24 @@ static int mtk_dpi_probe(struct platform_device *pdev)
1040
1040
}
1041
1041
mem = platform_get_resource (pdev , IORESOURCE_MEM , 0 );
1042
1042
dpi -> regs = devm_ioremap_resource (dev , mem );
1043
- if (IS_ERR (dpi -> regs )) {
1044
- ret = PTR_ERR (dpi -> regs );
1045
- dev_err (dev , "Failed to ioremap mem resource: %d\n" , ret );
1046
- return ret ;
1047
- }
1043
+ if (IS_ERR (dpi -> regs ))
1044
+ return dev_err_probe (dev , PTR_ERR (dpi -> regs ),
1045
+ "Failed to ioremap mem resource\n" );
1048
1046
1049
1047
dpi -> engine_clk = devm_clk_get (dev , "engine" );
1050
- if (IS_ERR (dpi -> engine_clk )) {
1051
- ret = PTR_ERR (dpi -> engine_clk );
1052
- if (ret != - EPROBE_DEFER )
1053
- dev_err (dev , "Failed to get engine clock: %d\n" , ret );
1054
-
1055
- return ret ;
1056
- }
1048
+ if (IS_ERR (dpi -> engine_clk ))
1049
+ return dev_err_probe (dev , PTR_ERR (dpi -> engine_clk ),
1050
+ "Failed to get engine clock\n" );
1057
1051
1058
1052
dpi -> pixel_clk = devm_clk_get (dev , "pixel" );
1059
- if (IS_ERR (dpi -> pixel_clk )) {
1060
- ret = PTR_ERR (dpi -> pixel_clk );
1061
- if (ret != - EPROBE_DEFER )
1062
- dev_err (dev , "Failed to get pixel clock: %d\n" , ret );
1063
-
1064
- return ret ;
1065
- }
1053
+ if (IS_ERR (dpi -> pixel_clk ))
1054
+ return dev_err_probe (dev , PTR_ERR (dpi -> pixel_clk ),
1055
+ "Failed to get pixel clock\n" );
1066
1056
1067
1057
dpi -> tvd_clk = devm_clk_get (dev , "pll" );
1068
- if (IS_ERR (dpi -> tvd_clk )) {
1069
- ret = PTR_ERR (dpi -> tvd_clk );
1070
- if (ret != - EPROBE_DEFER )
1071
- dev_err (dev , "Failed to get tvdpll clock: %d\n" , ret );
1072
-
1073
- return ret ;
1074
- }
1058
+ if (IS_ERR (dpi -> tvd_clk ))
1059
+ return dev_err_probe (dev , PTR_ERR (dpi -> tvd_clk ),
1060
+ "Failed to get tvdpll clock\n" );
1075
1061
1076
1062
dpi -> irq = platform_get_irq (pdev , 0 );
1077
1063
if (dpi -> irq <= 0 )
@@ -1095,10 +1081,8 @@ static int mtk_dpi_probe(struct platform_device *pdev)
1095
1081
return ret ;
1096
1082
1097
1083
ret = component_add (dev , & mtk_dpi_component_ops );
1098
- if (ret ) {
1099
- dev_err (dev , "Failed to add component: %d\n" , ret );
1100
- return ret ;
1101
- }
1084
+ if (ret )
1085
+ return dev_err_probe (dev , ret , "Failed to add component.\n" );
1102
1086
1103
1087
return 0 ;
1104
1088
}
0 commit comments