@@ -359,19 +359,15 @@ def generate_probe(p: Panel, options: Options) -> str:
359359 s += f'''
360360 ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies),
361361 ctx->supplies);
362- if (ret < 0) {{
363- dev_err(dev, "Failed to get regulators: %d\\ n", ret);
364- return ret;
365- }}
362+ if (ret < 0)
363+ return dev_err_probe(dev, ret, "Failed to get regulators\\ n");
366364'''
367365 else :
368366 s += f'''
369367 ctx->supply = devm_regulator_get(dev, "{ options .regulator [0 ]} ");
370- if (IS_ERR(ctx->supply)) {{
371- ret = PTR_ERR(ctx->supply);
372- dev_err(dev, "Failed to get { options .regulator [0 ]} regulator: %d\\ n", ret);
373- return ret;
374- }}
368+ if (IS_ERR(ctx->supply))
369+ return dev_err_probe(dev, PTR_ERR(ctx->supply),
370+ "Failed to get { options .regulator [0 ]} regulator\\ n");
375371'''
376372
377373 for name , flags in options .gpios .items ():
@@ -382,11 +378,9 @@ def generate_probe(p: Panel, options: Options) -> str:
382378
383379 s += f'''
384380 ctx->{ name } _gpio = devm_gpiod_get(dev, "{ name } ", { init } );
385- if (IS_ERR(ctx->{ name } _gpio)) {{
386- ret = PTR_ERR(ctx->{ name } _gpio);
387- dev_err(dev, "Failed to get { name } -gpios: %d\\ n", ret);
388- return ret;
389- }}
381+ if (IS_ERR(ctx->{ name } _gpio))
382+ return dev_err_probe(dev, PTR_ERR(ctx->{ name } _gpio),
383+ "Failed to get { name } -gpios\\ n");
390384'''
391385
392386 s += f'''
@@ -404,19 +398,15 @@ def generate_probe(p: Panel, options: Options) -> str:
404398 if p .backlight == BacklightControl .DCS :
405399 s += f'''
406400 ctx->panel.backlight = { p .short_id } _create_backlight(dsi);
407- if (IS_ERR(ctx->panel.backlight)) {{
408- ret = PTR_ERR(ctx->panel.backlight);
409- dev_err(dev, "Failed to create backlight: %d\\ n", ret);
410- return ret;
411- }}
401+ if (IS_ERR(ctx->panel.backlight))
402+ return dev_err_probe(dev, PTR_ERR(ctx->panel.backlight),
403+ "Failed to create backlight\\ n");
412404'''
413405 elif p .backlight :
414406 s += '''
415407 ret = drm_panel_of_backlight(&ctx->panel);
416- if (ret) {
417- dev_err(dev, "Failed to get backlight: %d\\ n", ret);
418- return ret;
419- }
408+ if (ret)
409+ return dev_err_probe(dev, ret, "Failed to get backlight\\ n");
420410'''
421411
422412 s += '''
0 commit comments