Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp4115689pxv; Mon, 26 Jul 2021 22:06:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyp+UlmcMn57tc6V6F1tZbHQZh/leDqMUxyBrK5ILixU78HGyEQ6SCQzq6qAzl89/Tk3BWz X-Received: by 2002:a5e:dc48:: with SMTP id s8mr17681305iop.133.1627362397967; Mon, 26 Jul 2021 22:06:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627362397; cv=none; d=google.com; s=arc-20160816; b=r8Br3xGXuA8qfa6Ht3RbJtq5E4vAvk/VmYse/c3A4y6jnsX2ngT+tiGKOaT8LB3ED7 iko4QItKTmJ4b9vitPqYApxK6XSa1HQ19HMHVHqa87byZ8BmcpG7CFlo3L1AGgzhmOIF ZHbUb40nPM+z3jkFbbRpywWt2qr3SItjJrJk5gEsQWlUlqml/Chxu4lb1I7x2/kQkxE9 v8Vaylfj5y9QT3luXt+p2+wzvAJKoochc6Oq0u6a/9RHO24/Tl0t0gM8a4G930uoCpqG dZmDxrBqxFZCwmD6EH2j74/la1yrxcckGj8iuWa6arhgJpX20u/liZ+4XQ2kvxroOHCD srjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=LbsOlfHeqNxTseZbI6JEafTqvq2PmDXu+dYbdpp/3uU=; b=jW6m78xOkuNjLWcchIKVmOyJKOuAjtZX+qPzSd5q5VNC2gGnHNYGYkCXFXVAOKftsy NgDwCpOdI1Kf66Fddu9+gKkdrkAMDKV5OxDkD1btdrBlfXFmHFLhrRKJED7+rLc/13Bw BIu0MfsRHrUUqxc4sCGlbDb7+0sKWvdIIm3AZgcDZbCJkoIgyAKegD2l1+ooONj7I8Wg k6/Dp0MfwE/7aFlwIaIyFpfyKOYbMmvIMd99oIkdxVHt6xhYe3WsOVl/UhWkQ7ZGYQgJ 5bLvXBYP7bO89iB1uBn0RfH33RHuH8tJlPmECMQo8PGpwujYNI46tcOmNX8uH8f6pBPG pFaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=LEYB0v4o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j17si1849858ilq.87.2021.07.26.22.06.25; Mon, 26 Jul 2021 22:06:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=LEYB0v4o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235110AbhG0FF0 (ORCPT + 99 others); Tue, 27 Jul 2021 01:05:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234992AbhG0FFZ (ORCPT ); Tue, 27 Jul 2021 01:05:25 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35763C061757; Mon, 26 Jul 2021 22:05:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:In-Reply-To:References; bh=LbsOlfHeqNxTseZbI6JEafTqvq2PmDXu+dYbdpp/3uU=; b=LEYB0v4o2AJFAnH61UR7Bo2Uei 66oVAJZFUsUisXHx7BswJ31Lu3uD0IRNNyNKbQOwlt4i14TMxD8jwbKmyyeSbcnwLS5y6UKsTVDdq 0cQ6x9mnYEVCDDK4n9GgkX+sV/5cxzOaSB1IJGKx3MLIXjjBWESW/5CSgGQDFp2Lgn3hSKpYrZjkR akuXBztefQZVtAVUFqR7hu5LuQGelkxi3HgoFs8VTdlI2AuHJcSht8EIkaRC23361loIG4efl5tM5 LX6SToyDSbo9g+7ze1jeNUWpkCkyQFTSXH0uB/ONszAbQsr0q/qZwcO/gIymbFzQMYGJgaMIy8NYR YYgi40WQ==; Received: from [2601:1c0:6280:3f0:76e5:bff:fe2d:dc28] (helo=smtpauth.infradead.org) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1m8FGu-00Eg9T-RM; Tue, 27 Jul 2021 05:05:01 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Ard Biesheuvel , linux-efi@vger.kernel.org, dri-devel@lists.freedesktop.org, Javier Martinez Canillas , Thomas Zimmermann , Mark Brown , linux-next@vger.kernel.org Subject: [PATCH] efi: sysfb_efi: fix build when EFI is not set Date: Mon, 26 Jul 2021 22:04:47 -0700 Message-Id: <20210727050447.7339-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When # CONFIG_EFI is not set, there are 2 definitions of sysfb_apply_efi_quirks(). The stub from sysfb.h should be used and the __init function from sysfb_efi.c should not be used. ../drivers/firmware/efi/sysfb_efi.c:337:13: error: redefinition of ‘sysfb_apply_efi_quirks’ __init void sysfb_apply_efi_quirks(struct platform_device *pd) ^~~~~~~~~~~~~~~~~~~~~~ In file included from ../drivers/firmware/efi/sysfb_efi.c:26:0: ../include/linux/sysfb.h:65:20: note: previous definition of ‘sysfb_apply_efi_quirks’ was here static inline void sysfb_apply_efi_quirks(struct platform_device *pd) ^~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Randy Dunlap Cc: Ard Biesheuvel Cc: linux-efi@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: Javier Martinez Canillas Cc: Thomas Zimmermann Cc: Mark Brown Cc: linux-next@vger.kernel.org --- drivers/firmware/efi/sysfb_efi.c | 2 ++ 1 file changed, 2 insertions(+) --- linext-20210726.orig/drivers/firmware/efi/sysfb_efi.c +++ linext-20210726/drivers/firmware/efi/sysfb_efi.c @@ -332,6 +332,7 @@ static const struct fwnode_operations ef .add_links = efifb_add_links, }; +#ifdef CONFIG_EFI static struct fwnode_handle efifb_fwnode; __init void sysfb_apply_efi_quirks(struct platform_device *pd) @@ -354,3 +355,4 @@ __init void sysfb_apply_efi_quirks(struc pd->dev.fwnode = &efifb_fwnode; } } +#endif