@@ -403,17 +403,10 @@ static int panel_edp_unprepare(struct drm_panel *panel)
403
403
404
404
static int panel_edp_get_hpd_gpio (struct device * dev , struct panel_edp * p )
405
405
{
406
- int err ;
407
-
408
406
p -> hpd_gpio = devm_gpiod_get_optional (dev , "hpd" , GPIOD_IN );
409
- if (IS_ERR (p -> hpd_gpio )) {
410
- err = PTR_ERR (p -> hpd_gpio );
411
-
412
- if (err != - EPROBE_DEFER )
413
- dev_err (dev , "failed to get 'hpd' GPIO: %d\n" , err );
414
-
415
- return err ;
416
- }
407
+ if (IS_ERR (p -> hpd_gpio ))
408
+ return dev_err_probe (dev , PTR_ERR (p -> hpd_gpio ),
409
+ "failed to get 'hpd' GPIO\n" );
417
410
418
411
return 0 ;
419
412
}
@@ -832,12 +825,9 @@ static int panel_edp_probe(struct device *dev, const struct panel_desc *desc,
832
825
833
826
panel -> enable_gpio = devm_gpiod_get_optional (dev , "enable" ,
834
827
GPIOD_OUT_LOW );
835
- if (IS_ERR (panel -> enable_gpio )) {
836
- err = PTR_ERR (panel -> enable_gpio );
837
- if (err != - EPROBE_DEFER )
838
- dev_err (dev , "failed to request GPIO: %d\n" , err );
839
- return err ;
840
- }
828
+ if (IS_ERR (panel -> enable_gpio ))
829
+ return dev_err_probe (dev , PTR_ERR (panel -> enable_gpio ),
830
+ "failed to request GPIO\n" );
841
831
842
832
err = of_drm_get_panel_orientation (dev -> of_node , & panel -> orientation );
843
833
if (err ) {
0 commit comments