Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp4176168pxv; Tue, 27 Jul 2021 00:11:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFz6P7AA1CwktC045NSDeHUi6qIVSgn7T7xUwyEkRhoOQ5TAkJ4E+t9HMXl2HEBQo8gwCe X-Received: by 2002:a17:907:7808:: with SMTP id la8mr20658861ejc.13.1627369894218; Tue, 27 Jul 2021 00:11:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627369894; cv=none; d=google.com; s=arc-20160816; b=XDjS8Na1GvlUX3MpdcK0vBuJtY6obYoQdjjP/IApF0mVJZ6sVS75ogzW0QwfMp7Lqn agA/uox6yg11X1l6cDqnJ/fWN2IJtoDfMvAidp0MzdUyPUOlCGU0kyO0DfzyoF42y9e4 zWy+HHsUrStK+gLeirImGqkgdF/DKXdu/hMX9hwDc+frNV21QK0c3awNF8fQgfyIHelT 6A0waCVpIiTBWRtLXI9XCHOCjax1v7w4GiQ52LG99OvSkwkVpoOd6eC669udC9ALOjGx SiNq12+PeppSSxjjBz7a6XnEh9AOu/hTQY1WqKSbu3A+r9+Qfse2w8mHlBLK3BoJwA1o XcSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=ghpYEQMS0GkY9QsMrLddAlllE5ey+GAbNezWIol2ugs=; b=w4+L63Mow0Y/1BqmjWLVH0//TRsdpVIODnKrzkknisx9ZRVjNl5nsyRMgVQAiUReo1 01ZQr8YYmzQyov3VCejy3Z7fBq2uiYszs63pDXFUTD9Kkp0OVFzYH7OMuhXRlFU3X9K+ aHpJV/iYDYd3EcAbWOBQQPh37HbxtliZFKo67PnuyWr5MKMcwWjbaviRw/xQhs/ud9as 3YeSFT9+x87wGH/PLM/b/XbTeexGL84ROWxUg9ESxThDtON9ENbaH6H7eLpSsfYA7F53 lup5xX7KqaniJvS5sM5l54V04q8NGcR77KzVtid+yQ1rFQItRoHWeyrjaDepcDv/IO4D LHpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=e18QTB8F; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b26si2161585edr.39.2021.07.27.00.11.11; Tue, 27 Jul 2021 00:11:34 -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=@kernel.org header.s=k20201202 header.b=e18QTB8F; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235890AbhG0HGR (ORCPT + 99 others); Tue, 27 Jul 2021 03:06:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:38670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235812AbhG0HGG (ORCPT ); Tue, 27 Jul 2021 03:06:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EF3FE6120F; Tue, 27 Jul 2021 07:06:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627369567; bh=1TC/Az3GWgRQRVEMAdi/3rlrGgY9/Gln3X8vwmTmv+g=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=e18QTB8FQVC/Pcu8BKEZpNDao+wOja4eIGe8ORUkTz/5mu433x3r6MlAyEWpROJ7F lPOWO39RR4IIDbnnuKaaI9sbAPOS02dGWl3ugYBcXWXhjlCfZCau+i28gehAVHRurC ErRp9qtzBgvGOfh8n4ms+39n3D4UDBVQ8uLGZMjQJLXq7BaVtujRLCD0g0voQadJOt MyfiFP96UN7corSNOUr/x4HmBuJbjLUDTMrFjiU9aOsiTqDiVYxH92I6aZHAj56STi OWHn+SOyClwoEmCRovJsScZBOkuQCoRtjySbpK5x0SqwtFAVY/GMK8nKo9xY2QM0Qe 2y95Khxudlecg== Received: by mail-ot1-f42.google.com with SMTP id o2-20020a9d22020000b0290462f0ab0800so7860275ota.11; Tue, 27 Jul 2021 00:06:06 -0700 (PDT) X-Gm-Message-State: AOAM530hZV/K2AdwOP3jL0M4uCNKLBqDBSKaXyj7R5WrSlhbaOhgmtyx CndFUGhnUilHubfVw1w9iYnYK0pA+BvCuC+znd8= X-Received: by 2002:a05:6830:34a6:: with SMTP id c38mr14149146otu.108.1627369566333; Tue, 27 Jul 2021 00:06:06 -0700 (PDT) MIME-Version: 1.0 References: <20210727050447.7339-1-rdunlap@infradead.org> In-Reply-To: <20210727050447.7339-1-rdunlap@infradead.org> From: Ard Biesheuvel Date: Tue, 27 Jul 2021 09:05:55 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH] efi: sysfb_efi: fix build when EFI is not set To: Randy Dunlap Cc: Linux Kernel Mailing List , linux-efi , dri-devel , Javier Martinez Canillas , Thomas Zimmermann , Mark Brown , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 27 Jul 2021 at 07:05, Randy Dunlap wrote: > > 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 =E2=80= =98sysfb_apply_efi_quirks=E2=80=99 > __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 =E2=80=98sys= fb_apply_efi_quirks=E2=80=99 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 Acked-by: Ard Biesheuvel > --- > 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 =3D 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 =3D &efifb_fwnode; > } > } > +#endif