[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <YdcAOL6hCck2jqXq@kroah.com>
Date: Thu, 6 Jan 2022 15:44:08 +0100
From: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To: linux-kernel@...r.kernel.org
Cc: Borislav Petkov <bp@...en8.de>,
Luis Chamberlain <mcgrof@...nel.org>
Subject: Re: [PATCH] firmware: remove old CONFIG_FW_LOADER_MODULE test
On Thu, Dec 30, 2021 at 10:39:32AM +0100, Greg Kroah-Hartman wrote:
> The CONFIG_FW_LOADER_MODULE check in firmware.h is very obsolete given
> that this symbol went away decades ago, so it should be removed.
>
> Reported-by: Borislav Petkov <bp@...en8.de>
> Cc: Luis Chamberlain <mcgrof@...nel.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
> ---
> include/linux/firmware.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/firmware.h b/include/linux/firmware.h
> index 3b057dfc8284..0b1c4d9c5465 100644
> --- a/include/linux/firmware.h
> +++ b/include/linux/firmware.h
> @@ -34,7 +34,7 @@ static inline bool firmware_request_builtin(struct firmware *fw,
> }
> #endif
>
> -#if defined(CONFIG_FW_LOADER) || (defined(CONFIG_FW_LOADER_MODULE) && defined(MODULE))
> +#if defined(CONFIG_FW_LOADER)
> int request_firmware(const struct firmware **fw, const char *name,
> struct device *device);
> int firmware_request_nowarn(const struct firmware **fw, const char *name,
> --
> 2.34.1
>
Odd, 0-day reports a bunch of warnings with this change:
drivers/base/firmware_loader/main.c:1054:1: error: redefinition of 'request_firmware_nowait'
drivers/base/firmware_loader/main.c:811:1: error: redefinition of 'request_firmware'
drivers/base/firmware_loader/main.c:838:5: error: redefinition of 'firmware_request_nowarn'
drivers/base/firmware_loader/main.c:863:5: error: redefinition of 'request_firmware_direct'
drivers/base/firmware_loader/main.c:887:5: error: redefinition of 'firmware_request_platform'
drivers/base/firmware_loader/main.c:941:1: error: redefinition of 'request_firmware_into_buf'
drivers/base/firmware_loader/main.c:970:1: error: redefinition of 'request_partial_firmware_into_buf'
drivers/base/firmware_loader/main.c:992:6: error: redefinition of 'release_firmware'
Luis, any ideas?
thanks,
greg k-h
Powered by blists - more mailing lists