Quoting Jani Nikula (2023-04-13 06:47:30) > Follow the usual naming conventions. > > Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> Reviewed-by: Gustavo Sousa <gustavo.sousa@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_display_driver.c | 2 +- > drivers/gpu/drm/i915/display/intel_display_driver.h | 2 +- > drivers/gpu/drm/i915/i915_pci.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c > index 1386f2001613..882a2586aba4 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_driver.c > +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c > @@ -21,7 +21,7 @@ > #include "intel_fbdev.h" > #include "intel_opregion.h" > > -bool intel_modeset_probe_defer(struct pci_dev *pdev) > +bool intel_display_driver_probe_defer(struct pci_dev *pdev) > { > struct drm_privacy_screen *privacy_screen; > > diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h > index 4c18792fcafd..744117b04ed4 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_driver.h > +++ b/drivers/gpu/drm/i915/display/intel_display_driver.h > @@ -11,7 +11,7 @@ > struct drm_i915_private; > struct pci_dev; > > -bool intel_modeset_probe_defer(struct pci_dev *pdev); > +bool intel_display_driver_probe_defer(struct pci_dev *pdev); > void intel_display_driver_register(struct drm_i915_private *i915); > void intel_display_driver_unregister(struct drm_i915_private *i915); > > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c > index bda5caa33f12..d64e074d7457 100644 > --- a/drivers/gpu/drm/i915/i915_pci.c > +++ b/drivers/gpu/drm/i915/i915_pci.c > @@ -1355,7 +1355,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > return -ENXIO; > > /* Detect if we need to wait for other drivers early on */ > - if (intel_modeset_probe_defer(pdev)) > + if (intel_display_driver_probe_defer(pdev)) > return -EPROBE_DEFER; > > err = i915_driver_probe(pdev, ent); > -- > 2.39.2 >