@@ -256,29 +256,19 @@ static int sunxi_de2_clk_probe(struct platform_device *pdev)
256
256
return PTR_ERR (reg );
257
257
258
258
bus_clk = devm_clk_get (& pdev -> dev , "bus" );
259
- if (IS_ERR (bus_clk )) {
260
- ret = PTR_ERR (bus_clk );
261
- if (ret != - EPROBE_DEFER )
262
- dev_err (& pdev -> dev , "Couldn't get bus clk: %d\n" , ret );
263
- return ret ;
264
- }
259
+ if (IS_ERR (bus_clk ))
260
+ return dev_err_probe (& pdev -> dev , PTR_ERR (bus_clk ),
261
+ "Couldn't get bus clk\n" );
265
262
266
263
mod_clk = devm_clk_get (& pdev -> dev , "mod" );
267
- if (IS_ERR (mod_clk )) {
268
- ret = PTR_ERR (mod_clk );
269
- if (ret != - EPROBE_DEFER )
270
- dev_err (& pdev -> dev , "Couldn't get mod clk: %d\n" , ret );
271
- return ret ;
272
- }
264
+ if (IS_ERR (mod_clk ))
265
+ return dev_err_probe (& pdev -> dev , PTR_ERR (mod_clk ),
266
+ "Couldn't get mod clk\n" );
273
267
274
268
rstc = devm_reset_control_get_exclusive (& pdev -> dev , NULL );
275
- if (IS_ERR (rstc )) {
276
- ret = PTR_ERR (rstc );
277
- if (ret != - EPROBE_DEFER )
278
- dev_err (& pdev -> dev ,
279
- "Couldn't get reset control: %d\n" , ret );
280
- return ret ;
281
- }
269
+ if (IS_ERR (rstc ))
270
+ return dev_err_probe (& pdev -> dev , PTR_ERR (rstc ),
271
+ "Couldn't get reset control\n" );
282
272
283
273
/* The clocks need to be enabled for us to access the registers */
284
274
ret = clk_prepare_enable (bus_clk );
0 commit comments