| Message ID | 20210219074124.1571269-1-narmstrong@baylibre.com |
|---|---|
| State | Accepted |
| Commit | 2d339efb1ff941705a770e93494427912689ce18 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | button: add udevice forward declaration | expand |
On Fri, 19 Feb 2021 at 00:41, Neil Armstrong <narmstrong@baylibre.com> wrote: > > After 401d1c4f5d2d ("common: Drop asm/global_data.h from common header") > build fails with : > > drivers/button/button-uclass.c:13:5: error: conflicting types for 'button_get_by_label' > int button_get_by_label(const char *label, struct udevice **devp) > ^~~~~~~~~~~~~~~~~~~ > > Adding struct udevice forward declaration in button.h solves the build error. > > Fixes: 401d1c4f5d2d ("common: Drop asm/global_data.h from common header") > Suggested-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > Hi, > > This is needed to fix build on vim3/vim3l after [1] is applied. > > [1] https://patchwork.ozlabs.org/project/uboot/cover/20210218103318.18915-1-m.szyprowski@samsung.com/ > > include/button.h | 2 ++ > 1 file changed, 2 insertions(+) > Reviewed-by: Simon Glass <sjg@chromium.org>
On 20/02/2021 12:55, Simon Glass wrote: > On Fri, 19 Feb 2021 at 00:41, Neil Armstrong <narmstrong@baylibre.com> wrote: >> >> After 401d1c4f5d2d ("common: Drop asm/global_data.h from common header") >> build fails with : >> >> drivers/button/button-uclass.c:13:5: error: conflicting types for 'button_get_by_label' >> int button_get_by_label(const char *label, struct udevice **devp) >> ^~~~~~~~~~~~~~~~~~~ >> >> Adding struct udevice forward declaration in button.h solves the build error. >> >> Fixes: 401d1c4f5d2d ("common: Drop asm/global_data.h from common header") >> Suggested-by: Heinrich Schuchardt <xypron.glpk@gmx.de> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> Hi, >> >> This is needed to fix build on vim3/vim3l after [1] is applied. >> >> [1] https://patchwork.ozlabs.org/project/uboot/cover/20210218103318.18915-1-m.szyprowski@samsung.com/ >> >> include/button.h | 2 ++ >> 1 file changed, 2 insertions(+) >> > > Reviewed-by: Simon Glass <sjg@chromium.org> > Thanks, applied to u-boot-amlogic Neil
diff --git a/include/button.h b/include/button.h index 688b63b082..ee14fadf0c 100644 --- a/include/button.h +++ b/include/button.h @@ -6,6 +6,8 @@ #ifndef __BUTTON_H #define __BUTTON_H +struct udevice; + /** * struct button_uc_plat - Platform data the uclass stores about each device *
After 401d1c4f5d2d ("common: Drop asm/global_data.h from common header") build fails with : drivers/button/button-uclass.c:13:5: error: conflicting types for 'button_get_by_label' int button_get_by_label(const char *label, struct udevice **devp) ^~~~~~~~~~~~~~~~~~~ Adding struct udevice forward declaration in button.h solves the build error. Fixes: 401d1c4f5d2d ("common: Drop asm/global_data.h from common header") Suggested-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- Hi, This is needed to fix build on vim3/vim3l after [1] is applied. [1] https://patchwork.ozlabs.org/project/uboot/cover/20210218103318.18915-1-m.szyprowski@samsung.com/ include/button.h | 2 ++ 1 file changed, 2 insertions(+)