Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm: probe_helper: Hide ugly ifdef

Push the ifdef to the drm_edid.h and create a stub, for the
DRM_LOAD_EDID_FIRMWARE=n case. This removes some clutter in
the code, making it more readable.

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1461087638-16959-1-git-send-email-ezequiel@vanguardiasur.com.ar

authored by

Ezequiel Garcia and committed by
Daniel Vetter
ba34d58c d63c25e4

+8 -2
-2
drivers/gpu/drm/drm_probe_helper.c
··· 264 264 count = drm_add_edid_modes(connector, edid); 265 265 drm_edid_to_eld(connector, edid); 266 266 } else { 267 - #ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE 268 267 count = drm_load_edid_firmware(connector); 269 268 if (count == 0) 270 - #endif 271 269 count = (*connector_funcs->get_modes)(connector); 272 270 } 273 271
+8
include/drm/drm_edid.h
··· 328 328 int drm_av_sync_delay(struct drm_connector *connector, 329 329 const struct drm_display_mode *mode); 330 330 struct drm_connector *drm_select_eld(struct drm_encoder *encoder); 331 + 332 + #ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE 331 333 int drm_load_edid_firmware(struct drm_connector *connector); 334 + #else 335 + static inline int drm_load_edid_firmware(struct drm_connector *connector) 336 + { 337 + return 0; 338 + } 339 + #endif 332 340 333 341 int 334 342 drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,