@@ -225,24 +225,30 @@ static int rockchip_pcie_clk_init(struct rockchip_pcie *rockchip)
225
225
226
226
ret = devm_clk_bulk_get_all (dev , & rockchip -> clks );
227
227
if (ret < 0 )
228
- return ret ;
228
+ return dev_err_probe ( dev , ret , "failed to get clocks\n" ) ;
229
229
230
230
rockchip -> clk_cnt = ret ;
231
231
232
- return clk_bulk_prepare_enable (rockchip -> clk_cnt , rockchip -> clks );
232
+ ret = clk_bulk_prepare_enable (rockchip -> clk_cnt , rockchip -> clks );
233
+ if (ret )
234
+ return dev_err_probe (dev , ret , "failed to enable clocks\n" );
235
+
236
+ return 0 ;
233
237
}
234
238
235
239
static int rockchip_pcie_resource_get (struct platform_device * pdev ,
236
240
struct rockchip_pcie * rockchip )
237
241
{
238
242
rockchip -> apb_base = devm_platform_ioremap_resource_byname (pdev , "apb" );
239
243
if (IS_ERR (rockchip -> apb_base ))
240
- return PTR_ERR (rockchip -> apb_base );
244
+ return dev_err_probe (& pdev -> dev , PTR_ERR (rockchip -> apb_base ),
245
+ "failed to map apb registers\n" );
241
246
242
247
rockchip -> rst_gpio = devm_gpiod_get_optional (& pdev -> dev , "reset" ,
243
248
GPIOD_OUT_HIGH );
244
249
if (IS_ERR (rockchip -> rst_gpio ))
245
- return PTR_ERR (rockchip -> rst_gpio );
250
+ return dev_err_probe (& pdev -> dev , PTR_ERR (rockchip -> rst_gpio ),
251
+ "failed to get reset gpio\n" );
246
252
247
253
rockchip -> rst = devm_reset_control_array_get_exclusive (& pdev -> dev );
248
254
if (IS_ERR (rockchip -> rst ))
@@ -320,10 +326,9 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
320
326
rockchip -> vpcie3v3 = NULL ;
321
327
} else {
322
328
ret = regulator_enable (rockchip -> vpcie3v3 );
323
- if (ret ) {
324
- dev_err (dev , "failed to enable vpcie3v3 regulator\n" );
325
- return ret ;
326
- }
329
+ if (ret )
330
+ return dev_err_probe (dev , ret ,
331
+ "failed to enable vpcie3v3 regulator\n" );
327
332
}
328
333
329
334
ret = rockchip_pcie_phy_init (rockchip );
0 commit comments