Re: [PATCH] efi: sysfb_efi: fix build when EFI is not set

[Thomas Zimmermann]

Hi

Am 27.07.21 um 07:04 schrieb Randy Dunlap:

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 <rdun...@infradead.org>
Cc: Ard Biesheuvel <a...@kernel.org>
Cc: linux-...@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: Javier Martinez Canillas <javi...@redhat.com>
Cc: Thomas Zimmermann <tzimmerm...@suse.de>
Cc: Mark Brown <broo...@kernel.org>
Cc: linux-n...@vger.kernel.org

Thanks for the patch. It should have a fixes line

> dim fixes 8633ef82f101c040427b57d4df7b706261420b94




... and maybe a few more of the CCs below

Cc: Javier Martinez Canillas <javi...@redhat.com>

Cc: Borislav Petkov <b...@suse.de>

Cc: Daniel Vetter <daniel.vet...@ffwll.ch>

Cc: Thomas Zimmermann <tzimmerm...@suse.de>

Cc: Ard Biesheuvel <a...@kernel.org>

Cc: Paul Walmsley <paul.walms...@sifive.com>

Cc: Palmer Dabbelt <pal...@dabbelt.com>

Cc: Albert Ou <a...@eecs.berkeley.edu>

Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>

Cc: Linus Walleij <linus.wall...@linaro.org>

Cc: Krzysztof Kozlowski <krzysztof.kozlow...@canonical.com>

Cc: John Stultz <john.stu...@linaro.org>

Cc: Colin Ian King <colin.k...@canonical.com>

Cc: Nicolas Saenz Julienne <nsa...@kernel.org>

Cc: Sudeep Holla <sudeep.ho...@arm.com>

Cc: Maxime Ripard <max...@cerno.tech>

Cc: linux-...@vger.kernel.org

Cc: linux-ri...@lists.infradead.org


Best regards
Thomas

Fixes: 8633ef82f101 ("drivers/firmware: consolidate EFI framebuffer setup for all arches")

---
  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,
  };

  static struct fwnode_handle efifb_fwnode;

@@ -354,3 +355,4 @@ __init void sysfb_apply_efi_quirks(struc
                pd->dev.fwnode = &efifb_fwnode;
        }
  }
+#endif

+#ifdef CONFIG_EFI __init void sysfb_apply_efi_quirks(struct platform_device *pd)

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

OpenPGP_signature
Description: OpenPGP digital signature