From patchwork Tue Apr 19 17:40:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 8882361 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 51ADF9F39A for ; Tue, 19 Apr 2016 17:40:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 723D2202E5 for ; Tue, 19 Apr 2016 17:40:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A41732026C for ; Tue, 19 Apr 2016 17:40:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8812B6E7FF; Tue, 19 Apr 2016 17:40:56 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-x22d.google.com (mail-qg0-x22d.google.com [IPv6:2607:f8b0:400d:c04::22d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 71B6D6E7FF for ; Tue, 19 Apr 2016 17:40:54 +0000 (UTC) Received: by mail-qg0-x22d.google.com with SMTP id f52so13432294qga.3 for ; Tue, 19 Apr 2016 10:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=NjUTcSa7KLQvUil4HXwOpkEhdtN/5CWwPyuhrvcxweo=; b=z8SuidFcCFUZ3+uiTY5fDh/xMW6RBDLedN8skV24ZLrYnD1VRZauhdOeT8V4i/JhnM Nc5x3ok2ogs2ULoYOSMqmWx/Liqxo5bow66pgyrUmGik9FMgVj4xmhP57mMQExIoX7fl DgHAhA0QJIrmsRabW0IiYmHTa+G+HsYYj4qdGN7FdaAy3SBTnuLdmxNVGQ/T5T/P1ndw xAY2/AaYXTJ7EN+rKpqSUyQMTrpuaFWnJ4UNNmAxTBeJfMOZ9hLnfXCZbd4cIK4tIdxp DLfkAdsGxUD6NS082OkuPXkx+RnRbr1Do8dQnOtHcpru1yUHjyzyXIDWlSLYMmAhXnjR a9vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NjUTcSa7KLQvUil4HXwOpkEhdtN/5CWwPyuhrvcxweo=; b=UlFWa+RYlpX3hTNwokUMvoHp2FAbJMbjka6eOgUFpzNNtSgRyAe5MYl7kdytx1Z4Lu vFjrUKjhSzIeJCvWaT5kp9FkmcdhkvbZmM9opMIQtXMpIrdpqWxTofjsA5ghnz1cRZKX JGpVURv182yjDVqyE/vnW2AxyGxv3/V7x6tZSr6ZPC3CNOV4QuExy+QXHENzg08whwk4 1vkLhXCU0CtNbqNovR4+PLNhaEWyQNgVHyDM+MyED8EZwM1upT3cLn960k+ukVz3eWUN nW9VQMbD6P9aw19mOrRNHAzwTIVo2hz8PiipYhLXhAdgbxo+uhPSNB7Duon7M7CD3zsg MyXg== X-Gm-Message-State: AOPr4FXmhJ0pa0CraJdKEfWF7VfXLliENcTG8706UKziEtC7Bv0MUK3RDwktJa32oEHhvg== X-Received: by 10.140.91.194 with SMTP id z60mr3542784qgd.70.1461087653243; Tue, 19 Apr 2016 10:40:53 -0700 (PDT) Received: from localhost.localdomain ([190.2.108.156]) by smtp.gmail.com with ESMTPSA id o24sm14389035qko.32.2016.04.19.10.40.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Apr 2016 10:40:52 -0700 (PDT) From: Ezequiel Garcia To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm: probe_helper: Hide ugly ifdef Date: Tue, 19 Apr 2016 14:40:37 -0300 Message-Id: <1461087638-16959-1-git-send-email-ezequiel@vanguardiasur.com.ar> X-Mailer: git-send-email 2.7.0 Cc: Ezequiel Garcia X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Jani Nikula --- drivers/gpu/drm/drm_probe_helper.c | 2 -- include/drm/drm_edid.h | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index e714b5a7955f..0329080d7f7c 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -264,10 +264,8 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, count = drm_add_edid_modes(connector, edid); drm_edid_to_eld(connector, edid); } else { -#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE count = drm_load_edid_firmware(connector); if (count == 0) -#endif count = (*connector_funcs->get_modes)(connector); } diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 2af97691e878..5996598bc778 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -328,7 +328,15 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb); int drm_av_sync_delay(struct drm_connector *connector, const struct drm_display_mode *mode); struct drm_connector *drm_select_eld(struct drm_encoder *encoder); + +#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE int drm_load_edid_firmware(struct drm_connector *connector); +#else +static inline int drm_load_edid_firmware(struct drm_connector *connector) +{ + return 0; +} +#endif int drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,