From patchwork Thu Dec 19 10:37:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 11303057 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 714006C1 for ; Thu, 19 Dec 2019 10:37:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4EDB5222C2 for ; Thu, 19 Dec 2019 10:37:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="ewfFghgg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4EDB5222C2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BA3996EB03; Thu, 19 Dec 2019 10:37:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by gabe.freedesktop.org (Postfix) with ESMTPS id 98CF06EB03 for ; Thu, 19 Dec 2019 10:37:20 +0000 (UTC) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 27F7AE3B; Thu, 19 Dec 2019 11:37:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1576751838; bh=KI+4z8RAj9hiMjLA6cBPoppMaXInsK17FOoGVi1AOuc=; h=From:To:Cc:Subject:Date:From; b=ewfFghggkuA7KkFRmibyUVadfnfHLhd46A1ai//iBLBw5MMd9IXeDA0VQ56nYn4dk o3FeykrXsLgH/+9E2nO/L/J47nAUJTvoc/xLCIZlUsuqMFy3pUcRqDrhb4NfkDae7p jwHuXQdIcHPbCuOAMRVAEf+lskNYRUmnLO9RnDxc= From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm: of: Fix linking when CONFIG_OF is not set Date: Thu, 19 Dec 2019 12:37:03 +0200 Message-Id: <20191219103703.8547-1-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrizio Castro Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The new helper drm_of_lvds_get_dual_link_pixel_order() introduced in commit 6529007522de has a fallback stub when CONFIG_OF is not set, but the stub is declared in drm_of.h without a static inline. This causes multiple definitions of the function to be linked when the CONFIG_OF option isn't set. Fix it by making the stub static inline. Fixes: 6529007522de ("drm: of: Add drm_of_lvds_get_dual_link_pixel_order") Reported-by: kbuild test robot Signed-off-by: Laurent Pinchart Reviewed-by: Fabrizio Castro Reviewed-by: Chris Wilson --- This fixes a link error in drm-next. Daniel, Dave, would you like to apply the patch directly ? include/drm/drm_of.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index 8ec7ca6d2369..b9b093add92e 100644 --- a/include/drm/drm_of.h +++ b/include/drm/drm_of.h @@ -92,8 +92,9 @@ static inline int drm_of_find_panel_or_bridge(const struct device_node *np, return -EINVAL; } -int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1, - const struct device_node *port2) +static inline int +drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1, + const struct device_node *port2) { return -EINVAL; }