On Wed, Apr 03, 2024 at 06:19:34AM -0700, Guenter Roeck wrote: > Declaring the defines needed for suppressing warning inside > '#ifdef CONFIG_DEBUG_BUGVERBOSE' results in a kerneldoc warning. > > .../bug.h:29: warning: expecting prototype for _EMIT_BUG_ENTRY(). > Prototype was for HAVE_BUG_FUNCTION() instead > > Move the defines above the kerneldoc entry for _EMIT_BUG_ENTRY > to make kerneldoc happy. > > Reported-by: Simon Horman <horms@xxxxxxxxxx> > Cc: Simon Horman <horms@xxxxxxxxxx> > Cc: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx> > Cc: Rich Felker <dalias@xxxxxxxx> > Cc: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx> > Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx> > --- > v3: Added patch. Possibly squash into previous patch. FWIIW, this looks good to me. > arch/sh/include/asm/bug.h | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/arch/sh/include/asm/bug.h b/arch/sh/include/asm/bug.h > index 470ce6567d20..bf4947d51d69 100644 > --- a/arch/sh/include/asm/bug.h > +++ b/arch/sh/include/asm/bug.h > @@ -11,6 +11,15 @@ > #define HAVE_ARCH_BUG > #define HAVE_ARCH_WARN_ON > > +#ifdef CONFIG_DEBUG_BUGVERBOSE > +#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE > +# define HAVE_BUG_FUNCTION > +# define __BUG_FUNC_PTR "\t.long %O2\n" > +#else > +# define __BUG_FUNC_PTR > +#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ > +#endif /* CONFIG_DEBUG_BUGVERBOSE */ > + > /** > * _EMIT_BUG_ENTRY > * %1 - __FILE__ > @@ -25,13 +34,6 @@ > */ > #ifdef CONFIG_DEBUG_BUGVERBOSE > > -#ifdef CONFIG_KUNIT_SUPPRESS_BACKTRACE > -# define HAVE_BUG_FUNCTION > -# define __BUG_FUNC_PTR "\t.long %O2\n" > -#else > -# define __BUG_FUNC_PTR > -#endif /* CONFIG_KUNIT_SUPPRESS_BACKTRACE */ > - > #define _EMIT_BUG_ENTRY \ > "\t.pushsection __bug_table,\"aw\"\n" \ > "2:\t.long 1b, %O1\n" \ > -- > 2.39.2 >
