| Message ID | 20170710112300.958195-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 42a6e0996084972574e0a2b23e7326b78b0f64c5 |
| Headers | show |
On 10/07/17 12:22, Arnd Bergmann wrote: > The new support for nvmem devices from the rtc layer caused a build > error in some configurations: > > include/linux/nvmem-provider.h: In function 'nvmem_register': > include/linux/nvmem-provider.h:51:9: error: implicit declaration of function 'ERR_PTR' [-Werror=implicit-function-declaration] > > This adds the missing include to ensure we can always include > the header. > > Fixes: 697e5a47aa12 ("rtc: add generic nvmem support") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > I'd suggest adding this patch in the rtc tree on top of the > nvmem support there. Thanks for the patch, we would need similar patch for include/linux/nvmem-consumer.h too. Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > include/linux/nvmem-provider.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h > index cd93416d762e..497706f5adca 100644 > --- a/include/linux/nvmem-provider.h > +++ b/include/linux/nvmem-provider.h > @@ -12,6 +12,9 @@ > #ifndef _LINUX_NVMEM_PROVIDER_H > #define _LINUX_NVMEM_PROVIDER_H > > +#include <linux/err.h> > +#include <linux/errno.h> > + > struct nvmem_device; > struct nvmem_cell_info; > typedef int (*nvmem_reg_read_t)(void *priv, unsigned int offset, >
On Mon, Jul 10, 2017 at 1:33 PM, Srinivas Kandagatla <srinivas.kandagatla@linaro.org> wrote: > > > On 10/07/17 12:22, Arnd Bergmann wrote: >> >> The new support for nvmem devices from the rtc layer caused a build >> error in some configurations: >> >> include/linux/nvmem-provider.h: In function 'nvmem_register': >> include/linux/nvmem-provider.h:51:9: error: implicit declaration of >> function 'ERR_PTR' [-Werror=implicit-function-declaration] >> >> This adds the missing include to ensure we can always include >> the header. >> >> Fixes: 697e5a47aa12 ("rtc: add generic nvmem support") >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> --- >> I'd suggest adding this patch in the rtc tree on top of the >> nvmem support there. > > > Thanks for the patch, we would need similar patch for > include/linux/nvmem-consumer.h too. Makes sense, yes. Can you do that for 4.14? My patch for now is needed to fix a build regression in the rtc-next tree that I assume will otherwise make it into the 4.13 release. > Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Thanks! Arnd
On 10/07/17 13:10, Arnd Bergmann wrote: > Makes sense, yes. Can you do that for 4.14? My patch for now is > needed to fix a build regression in the rtc-next tree that I > assume will otherwise make it into the 4.13 release. Sure I will take care of that after rc1. thanks, srini
On 10/07/2017 at 13:22:50 +0200, Arnd Bergmann wrote: > The new support for nvmem devices from the rtc layer caused a build > error in some configurations: > > include/linux/nvmem-provider.h: In function 'nvmem_register': > include/linux/nvmem-provider.h:51:9: error: implicit declaration of function 'ERR_PTR' [-Werror=implicit-function-declaration] > > This adds the missing include to ensure we can always include > the header. > > Fixes: 697e5a47aa12 ("rtc: add generic nvmem support") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > I'd suggest adding this patch in the rtc tree on top of the > nvmem support there. > --- > include/linux/nvmem-provider.h | 3 +++ > 1 file changed, 3 insertions(+) > Applied, thanks. -- Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
On 10/07/2017 at 14:10:03 +0200, Arnd Bergmann wrote: > On Mon, Jul 10, 2017 at 1:33 PM, Srinivas Kandagatla > <srinivas.kandagatla@linaro.org> wrote: > > > > > > On 10/07/17 12:22, Arnd Bergmann wrote: > >> > >> The new support for nvmem devices from the rtc layer caused a build > >> error in some configurations: > >> > >> include/linux/nvmem-provider.h: In function 'nvmem_register': > >> include/linux/nvmem-provider.h:51:9: error: implicit declaration of > >> function 'ERR_PTR' [-Werror=implicit-function-declaration] > >> > >> This adds the missing include to ensure we can always include > >> the header. > >> > >> Fixes: 697e5a47aa12 ("rtc: add generic nvmem support") > >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> > >> --- > >> I'd suggest adding this patch in the rtc tree on top of the > >> nvmem support there. > > > > > > Thanks for the patch, we would need similar patch for > > include/linux/nvmem-consumer.h too. > > Makes sense, yes. Can you do that for 4.14? My patch for now is > needed to fix a build regression in the rtc-next tree that I > assume will otherwise make it into the 4.13 release. > Yes, I'm planning to send my PR soon. -- Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h index cd93416d762e..497706f5adca 100644 --- a/include/linux/nvmem-provider.h +++ b/include/linux/nvmem-provider.h @@ -12,6 +12,9 @@ #ifndef _LINUX_NVMEM_PROVIDER_H #define _LINUX_NVMEM_PROVIDER_H +#include <linux/err.h> +#include <linux/errno.h> + struct nvmem_device; struct nvmem_cell_info; typedef int (*nvmem_reg_read_t)(void *priv, unsigned int offset,
The new support for nvmem devices from the rtc layer caused a build error in some configurations: include/linux/nvmem-provider.h: In function 'nvmem_register': include/linux/nvmem-provider.h:51:9: error: implicit declaration of function 'ERR_PTR' [-Werror=implicit-function-declaration] This adds the missing include to ensure we can always include the header. Fixes: 697e5a47aa12 ("rtc: add generic nvmem support") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- I'd suggest adding this patch in the rtc tree on top of the nvmem support there. --- include/linux/nvmem-provider.h | 3 +++ 1 file changed, 3 insertions(+) -- 2.9.0