| Message ID | 20190708125247.3769080-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | caa2b557841c8cedc1d4862cd31cf76ee940d105 |
| Headers | show |
| Series | power: reset: nvmem-reboot-mode: add CONFIG_OF dependency | expand |
On 7/8/19 3:52 PM, Arnd Bergmann wrote: > Without CONFIG_OF, we get a build failure in the reboot-mode > implementation: > > drivers/power/reset/reboot-mode.c: In function 'reboot_mode_register': > drivers/power/reset/reboot-mode.c:72:2: error: implicit declaration of function 'for_each_property_of_node'; did you mean 'for_each_child_of_node'? [-Werror=implicit-function-declaration] > for_each_property_of_node(np, prop) { > > Add a Kconfig dependency like we have for the other users of > CONFIG_REBOOT_MODE. > > Fixes: 7a78a7f7695b ("power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/power/reset/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig > index 8dfb105db391..a564237278ff 100644 > --- a/drivers/power/reset/Kconfig > +++ b/drivers/power/reset/Kconfig > @@ -248,6 +248,7 @@ config POWER_RESET_SC27XX > > config NVMEM_REBOOT_MODE > tristate "Generic NVMEM reboot mode driver" > + depends on OF > select REBOOT_MODE > help > Say y here will enable reboot mode driver. This will > Wouldn't this be more appropriate to add the "depends on OF" to "config REBOOT_MODE" section, since this is an error to `reboot-mode.c` unit? Nandor
On Mon, Aug 5, 2019 at 9:10 AM Nandor Han <nandor.han@vaisala.com> wrote: > > On 7/8/19 3:52 PM, Arnd Bergmann wrote: > > Without CONFIG_OF, we get a build failure in the reboot-mode > > implementation: > > > > drivers/power/reset/reboot-mode.c: In function 'reboot_mode_register': > > drivers/power/reset/reboot-mode.c:72:2: error: implicit declaration of function 'for_each_property_of_node'; did you mean 'for_each_child_of_node'? [-Werror=implicit-function-declaration] > > for_each_property_of_node(np, prop) { > > > > Add a Kconfig dependency like we have for the other users of > > CONFIG_REBOOT_MODE. > > > > Fixes: 7a78a7f7695b ("power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > drivers/power/reset/Kconfig | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig > > index 8dfb105db391..a564237278ff 100644 > > --- a/drivers/power/reset/Kconfig > > +++ b/drivers/power/reset/Kconfig > > @@ -248,6 +248,7 @@ config POWER_RESET_SC27XX > > > > config NVMEM_REBOOT_MODE > > tristate "Generic NVMEM reboot mode driver" > > + depends on OF > > select REBOOT_MODE > > help > > Say y here will enable reboot mode driver. This will > > > > Wouldn't this be more appropriate to add the "depends on OF" to "config > REBOOT_MODE" section, since this is an error to `reboot-mode.c` unit? It's too late for 5.3-stable now, as that would break existing configurations that won't select REBOOT_MODE themselves, and it adds a bit of complexity, but we could to it for 5.4 if you think that is necessary. Arnd
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig index 8dfb105db391..a564237278ff 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -248,6 +248,7 @@ config POWER_RESET_SC27XX config NVMEM_REBOOT_MODE tristate "Generic NVMEM reboot mode driver" + depends on OF select REBOOT_MODE help Say y here will enable reboot mode driver. This will
Without CONFIG_OF, we get a build failure in the reboot-mode implementation: drivers/power/reset/reboot-mode.c: In function 'reboot_mode_register': drivers/power/reset/reboot-mode.c:72:2: error: implicit declaration of function 'for_each_property_of_node'; did you mean 'for_each_child_of_node'? [-Werror=implicit-function-declaration] for_each_property_of_node(np, prop) { Add a Kconfig dependency like we have for the other users of CONFIG_REBOOT_MODE. Fixes: 7a78a7f7695b ("power: reset: nvmem-reboot-mode: use NVMEM as reboot mode write interface") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/power/reset/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.20.0