@@ -261,21 +261,17 @@ enum {
261
261
static int q6v5_regulator_init (struct device * dev , struct reg_info * regs ,
262
262
const struct qcom_mss_reg_res * reg_res )
263
263
{
264
- int rc ;
265
264
int i ;
266
265
267
266
if (!reg_res )
268
267
return 0 ;
269
268
270
269
for (i = 0 ; reg_res [i ].supply ; i ++ ) {
271
270
regs [i ].reg = devm_regulator_get (dev , reg_res [i ].supply );
272
- if (IS_ERR (regs [i ].reg )) {
273
- rc = PTR_ERR (regs [i ].reg );
274
- if (rc != - EPROBE_DEFER )
275
- dev_err (dev , "Failed to get %s\n regulator" ,
276
- reg_res [i ].supply );
277
- return rc ;
278
- }
271
+ if (IS_ERR (regs [i ].reg ))
272
+ return dev_err_probe (dev , PTR_ERR (regs [i ].reg ),
273
+ "Failed to get %s\n regulator" ,
274
+ reg_res [i ].supply );
279
275
280
276
regs [i ].uV = reg_res [i ].uV ;
281
277
regs [i ].uA = reg_res [i ].uA ;
@@ -1813,14 +1809,10 @@ static int q6v5_init_clocks(struct device *dev, struct clk **clks,
1813
1809
1814
1810
for (i = 0 ; clk_names [i ]; i ++ ) {
1815
1811
clks [i ] = devm_clk_get (dev , clk_names [i ]);
1816
- if (IS_ERR (clks [i ])) {
1817
- int rc = PTR_ERR (clks [i ]);
1818
-
1819
- if (rc != - EPROBE_DEFER )
1820
- dev_err (dev , "Failed to get %s clock\n" ,
1821
- clk_names [i ]);
1822
- return rc ;
1823
- }
1812
+ if (IS_ERR (clks [i ]))
1813
+ return dev_err_probe (dev , PTR_ERR (clks [i ]),
1814
+ "Failed to get %s clock\n" ,
1815
+ clk_names [i ]);
1824
1816
}
1825
1817
1826
1818
return i ;
0 commit comments