| Message ID | 20220112023416.215644-1-mcgrof@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | firmware_loader: simplfy builtin or module check | expand |
On 1/11/22 18:34, Luis Chamberlain wrote: > The existing check is outdated and confuses developers. Use the > already existing IS_ENABLED() defined on kconfig.h which makes > the intention much clearer. > > Reported-by: Borislav Petkov <bp@alien8.de> > Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> Acked-by: Randy Dunlap <rdunlap@infradead.org> Thanks. > --- > 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..fa3493dbe84a 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)) The "defined(MODULE)" part wasn't needed here. :) > +#if IS_ENABLED(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,
On Wed, Jan 12, 2022 at 3:37 PM Randy Dunlap <rdunlap@infradead.org> wrote: > > > > On 1/11/22 18:34, Luis Chamberlain wrote: > > The existing check is outdated and confuses developers. Use the > > already existing IS_ENABLED() defined on kconfig.h which makes > > the intention much clearer. > > > > Reported-by: Borislav Petkov <bp@alien8.de> > > Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> > > Acked-by: Randy Dunlap <rdunlap@infradead.org> > > Thanks. > > > --- > > 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..fa3493dbe84a 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)) > > The "defined(MODULE)" part wasn't needed here. :) It _is_ needed. This seems to be equivalent to IS_REACHABLE(CONFIG_FW_LOADER), not IS_ENABLE(CONFIG_FW_LOADER). > > > +#if IS_ENABLED(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, > > -- > ~Randy
On 1/11/22 22:56, Masahiro Yamada wrote: > On Wed, Jan 12, 2022 at 3:37 PM Randy Dunlap <rdunlap@infradead.org> wrote: >> >> >> >> On 1/11/22 18:34, Luis Chamberlain wrote: >>> The existing check is outdated and confuses developers. Use the >>> already existing IS_ENABLED() defined on kconfig.h which makes >>> the intention much clearer. >>> >>> Reported-by: Borislav Petkov <bp@alien8.de> >>> Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> >>> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> >> >> Acked-by: Randy Dunlap <rdunlap@infradead.org> >> >> Thanks. >> >>> --- >>> 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..fa3493dbe84a 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)) >> >> The "defined(MODULE)" part wasn't needed here. :) > > > > It _is_ needed. > > This seems to be equivalent to IS_REACHABLE(CONFIG_FW_LOADER), > not IS_ENABLE(CONFIG_FW_LOADER). > Hm, /me confused. How can CONFIG_FW_LOADER_MODULE be =y when MODULE is not defined? > > >> >>> +#if IS_ENABLED(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, >> >> -- >> ~Randy > > >
On 1/11/22 23:03, Randy Dunlap wrote: > > > On 1/11/22 22:56, Masahiro Yamada wrote: >> On Wed, Jan 12, 2022 at 3:37 PM Randy Dunlap <rdunlap@infradead.org> wrote: >>> >>> >>> >>> On 1/11/22 18:34, Luis Chamberlain wrote: >>>> The existing check is outdated and confuses developers. Use the >>>> already existing IS_ENABLED() defined on kconfig.h which makes >>>> the intention much clearer. >>>> >>>> Reported-by: Borislav Petkov <bp@alien8.de> >>>> Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> >>>> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> >>> >>> Acked-by: Randy Dunlap <rdunlap@infradead.org> >>> >>> Thanks. >>> >>>> --- >>>> 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..fa3493dbe84a 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)) >>> >>> The "defined(MODULE)" part wasn't needed here. :) >> >> >> >> It _is_ needed. >> >> This seems to be equivalent to IS_REACHABLE(CONFIG_FW_LOADER), >> not IS_ENABLE(CONFIG_FW_LOADER).>> > > Hm, /me confused. > > How can CONFIG_FW_LOADER_MODULE be =y when MODULE is not defined? > OK, I get it now. Thanks for correcting me. >> >> >>> >>>> +#if IS_ENABLED(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, >>> >>> -- >>> ~Randy >> >> >> >
diff --git a/include/linux/firmware.h b/include/linux/firmware.h index 3b057dfc8284..fa3493dbe84a 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 IS_ENABLED(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,
The existing check is outdated and confuses developers. Use the already existing IS_ENABLED() defined on kconfig.h which makes the intention much clearer. Reported-by: Borislav Petkov <bp@alien8.de> Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org> --- include/linux/firmware.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)