Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1785607ybl; Thu, 19 Dec 2019 03:02:03 -0800 (PST) X-Google-Smtp-Source: APXvYqzDxc0p5T6FcWZxIM9wxJFQaKT242A8C2SVSc+CeDBO4Qmt9fUcAZrHOyAcKJkoQVOWo2in X-Received: by 2002:a9d:754a:: with SMTP id b10mr8226374otl.273.1576753323612; Thu, 19 Dec 2019 03:02:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576753323; cv=none; d=google.com; s=arc-20160816; b=KTv3UktxYOlcFSbwZqU2dH/kJJQKDR2JRcDSUX2/hRvu7tMYmfLWNrhSJIDRvt0vvW 2cbjlmIlwNBJIb2cSQKTB7SaZex/8ITrJB0jhg459+LxGq2nYrN8jSnZw2iHfn0EhAv0 QmxKWIWzncRO/dQkX7vicUpVx4IHhE4IZ5Fx+MUuVMzcchxUrYKx+l/ubWSqeHHaoJNa W0yYpdi7tDIniYvlncH9nYJGEm8FXs7H8iYThcU/s+3AmX2WVqvl1U7ujA/SlwF6QzkA DuCmwk1R8+hYNDWajt2q/7KnFAoeawU+rHYVEKjJoyeQK7nTSGCTXzFnIgf5m8A+WiYB KLGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=yfUMnJR9aPTkJ68bITkaNSyNLoVCXExDPDWFflgqmPc=; b=n1AAzQ2kFxyvq6R0iymeQXjUSnpwiSsKKbW3GOeYPXrJeomROa2HmeaAaxgDU7p8IM N3T7xpCUQ3OpjpgF3zDSEadDj6/bWuWVl4IZZssbAhNULKa1fH7tCht2g8c51Lmwl7cI 4dxJ3vB9W23kupgpYswL/EJGUhICU3b8SnDkW8HEuGU8fbfaU9cjM/uefaxSs8KJ6sOE /mo91CPoltJ3Fc2w55TafckGCzmBIrP2XV/M7eoVAC7teYa8JgXxm210cyooQtF+tqRo DuYh8CgOhemlxQJq4266wk7QK+1O4tk+V5bC1apdongOYPGlUgCjvx0Gtt1WY7zlJuUT iqhA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u3si2907618oif.167.2019.12.19.03.01.51; Thu, 19 Dec 2019 03:02:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727218AbfLSLAi (ORCPT + 99 others); Thu, 19 Dec 2019 06:00:38 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:44828 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727180AbfLSLAf (ORCPT ); Thu, 19 Dec 2019 06:00:35 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 03CD71D9F40D5B438C79; Thu, 19 Dec 2019 19:00:33 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.439.0; Thu, 19 Dec 2019 19:00:26 +0800 From: Chen Zhou To: , , , CC: , , Subject: [PATCH next] drm: of: fix build error without CONFIG_OF Date: Thu, 19 Dec 2019 18:57:17 +0800 Message-ID: <20191219105717.175829-1-chenzhou10@huawei.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Without CONFIG_OF, drm_of_lvds_get_dual_link_pixel_order should be static inline, otherwise building fails: drivers/gpu/drm/vc4/vc4_dsi.o: In function `drm_of_lvds_get_dual_link_pixel_order': vc4_dsi.c:(.text+0xa30): multiple definition of `drm_of_lvds_get_dual_link_pixel_order' drivers/gpu/drm/vc4/vc4_dpi.o:vc4_dpi.c:(.text+0x460): first defined here make[4]: *** [drivers/gpu/drm/vc4/vc4.o] Error 1 make[3]: *** [drivers/gpu/drm/vc4] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [drivers/gpu/drm] Error 2 make[1]: *** [drivers/gpu] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [drivers] Error 2 Fixes: 6529007522de (drm: of: Add drm_of_lvds_get_dual_link_pixel_order) Reported-by: Hulk Robot Signed-off-by: Chen Zhou --- include/drm/drm_of.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index 8ec7ca6..3398be9 100644 --- a/include/drm/drm_of.h +++ b/include/drm/drm_of.h @@ -92,7 +92,7 @@ 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, +static inline int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1, const struct device_node *port2) { return -EINVAL; -- 2.7.4