@@ -404,38 +404,30 @@ static int jdi_panel_add(struct jdi_panel *jdi)
404
404
405
405
ret = devm_regulator_bulk_get (dev , ARRAY_SIZE (jdi -> supplies ),
406
406
jdi -> supplies );
407
- if (ret < 0 ) {
408
- dev_err (dev , "failed to init regulator, ret=%d\n" , ret );
409
- return ret ;
410
- }
407
+ if (ret < 0 )
408
+ return dev_err_probe (dev , ret ,
409
+ "failed to init regulator, ret=%d\n" , ret );
411
410
412
411
jdi -> enable_gpio = devm_gpiod_get (dev , "enable" , GPIOD_OUT_LOW );
413
412
if (IS_ERR (jdi -> enable_gpio )) {
414
- ret = PTR_ERR (jdi -> enable_gpio );
415
- dev_err (dev , "cannot get enable-gpio %d\n" , ret );
416
- return ret ;
413
+ return dev_err_probe (dev , PTR_ERR (jdi -> enable_gpio ),
414
+ "cannot get enable-gpio %d\n" , ret );
417
415
}
418
416
419
417
jdi -> reset_gpio = devm_gpiod_get (dev , "reset" , GPIOD_OUT_HIGH );
420
- if (IS_ERR (jdi -> reset_gpio )) {
421
- ret = PTR_ERR (jdi -> reset_gpio );
422
- dev_err (dev , "cannot get reset-gpios %d\n" , ret );
423
- return ret ;
424
- }
418
+ if (IS_ERR (jdi -> reset_gpio ))
419
+ return dev_err_probe (dev , PTR_ERR (jdi -> reset_gpio ),
420
+ "cannot get reset-gpios %d\n" , ret );
425
421
426
422
jdi -> dcdc_en_gpio = devm_gpiod_get (dev , "dcdc-en" , GPIOD_OUT_LOW );
427
- if (IS_ERR (jdi -> dcdc_en_gpio )) {
428
- ret = PTR_ERR (jdi -> dcdc_en_gpio );
429
- dev_err (dev , "cannot get dcdc-en-gpio %d\n" , ret );
430
- return ret ;
431
- }
423
+ if (IS_ERR (jdi -> dcdc_en_gpio ))
424
+ return dev_err_probe (dev , PTR_ERR (jdi -> dcdc_en_gpio ),
425
+ "cannot get dcdc-en-gpio %d\n" , ret );
432
426
433
427
jdi -> backlight = drm_panel_create_dsi_backlight (jdi -> dsi );
434
- if (IS_ERR (jdi -> backlight )) {
435
- ret = PTR_ERR (jdi -> backlight );
436
- dev_err (dev , "failed to register backlight %d\n" , ret );
437
- return ret ;
438
- }
428
+ if (IS_ERR (jdi -> backlight ))
429
+ return dev_err_probe (dev , PTR_ERR (jdi -> backlight ),
430
+ "failed to register backlight %d\n" , ret );
439
431
440
432
drm_panel_init (& jdi -> base , & jdi -> dsi -> dev , & jdi_panel_funcs ,
441
433
DRM_MODE_CONNECTOR_DSI );
0 commit comments