summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2016-11-14 12:58:22 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-11-15 12:55:24 +0100
commit2d5e836de7b24fa79c67085689ee8160302c76a9 (patch)
tree93152a4ffa51fd38ea94b1a748460f8fe34bd707
parent4f93624ee7c05d5a8da77934a8a9e0e64e121ae6 (diff)
downloadlinux-stable-2d5e836de7b24fa79c67085689ee8160302c76a9.tar.gz
linux-stable-2d5e836de7b24fa79c67085689ee8160302c76a9.tar.bz2
linux-stable-2d5e836de7b24fa79c67085689ee8160302c76a9.zip
drm/print: Move kerneldoc next to definition
kerneldoc expects the comment next to definitions, otherwise it can't pick up exported vs. internal stuff. This fixes a warning from the doc build done with: $ make DOCBOOKS="" htmldocs Fixes: d8187177b0b1 ("drm: add helper for printing to log or seq_file") Cc: Rob Clark <robdclark@gmail.com> Cc: Sean Paul <seanpaul@chromium.org> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161114115825.22050-8-daniel.vetter@ffwll.ch
-rw-r--r--Documentation/gpu/drm-internals.rst2
-rw-r--r--drivers/gpu/drm/drm_print.c5
-rw-r--r--include/drm/drm_print.h5
3 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/gpu/drm-internals.rst b/Documentation/gpu/drm-internals.rst
index a54ac97510b3..e35920db1f4c 100644
--- a/Documentation/gpu/drm-internals.rst
+++ b/Documentation/gpu/drm-internals.rst
@@ -366,7 +366,7 @@ Printer
.. kernel-doc:: include/drm/drm_print.h
:internal:
-.. kernel-doc:: include/drm/drm_print.h
+.. kernel-doc:: drivers/gpu/drm/drm_print.c
:export:
diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index 34eb85618b76..ad3caaa1f48b 100644
--- a/drivers/gpu/drm/drm_print.c
+++ b/drivers/gpu/drm/drm_print.c
@@ -40,6 +40,11 @@ void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf)
}
EXPORT_SYMBOL(__drm_printfn_info);
+/**
+ * drm_printf - print to a &drm_printer stream
+ * @p: the &drm_printer
+ * @f: format string
+ */
void drm_printf(struct drm_printer *p, const char *f, ...)
{
struct va_format vaf;
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index 475ffe3730e9..1adf84aea622 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -74,11 +74,6 @@ struct drm_printer {
void __drm_printfn_seq_file(struct drm_printer *p, struct va_format *vaf);
void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf);
-/**
- * drm_printf - print to a &drm_printer stream
- * @p: the &drm_printer
- * @f: format string
- */
void drm_printf(struct drm_printer *p, const char *f, ...);