diff mbox series

[12/16] media: rkisp1: Compile debugfs support conditionally

Message ID 20220227160116.18556-13-laurent.pinchart@ideasonboard.com (mailing list archive)
State New, archived
Headers show
Series media: rkisp1: Misc bug fixes and cleanups | expand

Commit Message

Laurent Pinchart Feb. 27, 2022, 4:01 p.m. UTC 
When CONFIG_DEBUGFS is disabled, there's no need to compile the debugfs
support in. Make it conditional.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 .../media/platform/rockchip/rkisp1/Makefile   | 19 +++++++++++--------
 .../platform/rockchip/rkisp1/rkisp1-common.h  |  9 +++++++++
 2 files changed, 20 insertions(+), 8 deletions(-)

Comments

kernel test robot Feb. 28, 2022, 3:27 a.m. UTC | #1 
Hi Laurent,

I love your patch! Yet something to improve:

[auto build test ERROR on rockchip/for-next]
[also build test ERROR on media-tree/master v5.17-rc6 next-20220225]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Laurent-Pinchart/media-rkisp1-Misc-bug-fixes-and-cleanups/20220228-000306
base:   https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git for-next
config: m68k-randconfig-r022-20220228 (https://download.01.org/0day-ci/archive/20220228/202202281151.lY2yvuon-lkp@intel.com/config)
compiler: m68k-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/0day-ci/linux/commit/2ee8966047a595378fe16e057f9a25fd7e237f9c
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Laurent-Pinchart/media-rkisp1-Misc-bug-fixes-and-cleanups/20220228-000306
        git checkout 2ee8966047a595378fe16e057f9a25fd7e237f9c
        # save the config file to linux build tree
        mkdir build_dir
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=m68k SHELL=/bin/bash drivers/media/platform/rockchip/rkisp1/

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c:16:6: error: redefinition of 'rkisp1_debug_init'
      16 | void rkisp1_debug_init(struct rkisp1_device *rkisp1)
         |      ^~~~~~~~~~~~~~~~~
   In file included from drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c:14:
   drivers/media/platform/rockchip/rkisp1/rkisp1-common.h:525:20: note: previous definition of 'rkisp1_debug_init' with type 'void(struct rkisp1_device *)'
     525 | static inline void rkisp1_debug_init(struct rkisp1_device *rkisp1)
         |                    ^~~~~~~~~~~~~~~~~
>> drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c:47:6: error: redefinition of 'rkisp1_debug_cleanup'
      47 | void rkisp1_debug_cleanup(struct rkisp1_device *rkisp1)
         |      ^~~~~~~~~~~~~~~~~~~~
   In file included from drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c:14:
   drivers/media/platform/rockchip/rkisp1/rkisp1-common.h:528:20: note: previous definition of 'rkisp1_debug_cleanup' with type 'void(struct rkisp1_device *)'
     528 | static inline void rkisp1_debug_cleanup(struct rkisp1_device *rkisp1)
         |                    ^~~~~~~~~~~~~~~~~~~~


vim +/rkisp1_debug_init +16 drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c

d321afe87aa3ed Laurent Pinchart 2022-02-27  15  
d321afe87aa3ed Laurent Pinchart 2022-02-27 @16  void rkisp1_debug_init(struct rkisp1_device *rkisp1)
d321afe87aa3ed Laurent Pinchart 2022-02-27  17  {
d321afe87aa3ed Laurent Pinchart 2022-02-27  18  	struct rkisp1_debug *debug = &rkisp1->debug;
d321afe87aa3ed Laurent Pinchart 2022-02-27  19  
d321afe87aa3ed Laurent Pinchart 2022-02-27  20  	debug->debugfs_dir = debugfs_create_dir(dev_name(rkisp1->dev), NULL);
d321afe87aa3ed Laurent Pinchart 2022-02-27  21  
d321afe87aa3ed Laurent Pinchart 2022-02-27  22  	debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir,
d321afe87aa3ed Laurent Pinchart 2022-02-27  23  			     &debug->data_loss);
d321afe87aa3ed Laurent Pinchart 2022-02-27  24  	debugfs_create_ulong("outform_size_err", 0444,  debug->debugfs_dir,
d321afe87aa3ed Laurent Pinchart 2022-02-27  25  			     &debug->outform_size_error);
d321afe87aa3ed Laurent Pinchart 2022-02-27  26  	debugfs_create_ulong("img_stabilization_size_error", 0444,
d321afe87aa3ed Laurent Pinchart 2022-02-27  27  			     debug->debugfs_dir,
d321afe87aa3ed Laurent Pinchart 2022-02-27  28  			     &debug->img_stabilization_size_error);
d321afe87aa3ed Laurent Pinchart 2022-02-27  29  	debugfs_create_ulong("inform_size_error", 0444,  debug->debugfs_dir,
d321afe87aa3ed Laurent Pinchart 2022-02-27  30  			     &debug->inform_size_error);
d321afe87aa3ed Laurent Pinchart 2022-02-27  31  	debugfs_create_ulong("irq_delay", 0444,  debug->debugfs_dir,
d321afe87aa3ed Laurent Pinchart 2022-02-27  32  			     &debug->irq_delay);
d321afe87aa3ed Laurent Pinchart 2022-02-27  33  	debugfs_create_ulong("mipi_error", 0444, debug->debugfs_dir,
d321afe87aa3ed Laurent Pinchart 2022-02-27  34  			     &debug->mipi_error);
d321afe87aa3ed Laurent Pinchart 2022-02-27  35  	debugfs_create_ulong("stats_error", 0444, debug->debugfs_dir,
d321afe87aa3ed Laurent Pinchart 2022-02-27  36  			     &debug->stats_error);
d321afe87aa3ed Laurent Pinchart 2022-02-27  37  	debugfs_create_ulong("mp_stop_timeout", 0444, debug->debugfs_dir,
d321afe87aa3ed Laurent Pinchart 2022-02-27  38  			     &debug->stop_timeout[RKISP1_MAINPATH]);
d321afe87aa3ed Laurent Pinchart 2022-02-27  39  	debugfs_create_ulong("sp_stop_timeout", 0444, debug->debugfs_dir,
d321afe87aa3ed Laurent Pinchart 2022-02-27  40  			     &debug->stop_timeout[RKISP1_SELFPATH]);
d321afe87aa3ed Laurent Pinchart 2022-02-27  41  	debugfs_create_ulong("mp_frame_drop", 0444, debug->debugfs_dir,
d321afe87aa3ed Laurent Pinchart 2022-02-27  42  			     &debug->frame_drop[RKISP1_MAINPATH]);
d321afe87aa3ed Laurent Pinchart 2022-02-27  43  	debugfs_create_ulong("sp_frame_drop", 0444, debug->debugfs_dir,
d321afe87aa3ed Laurent Pinchart 2022-02-27  44  			     &debug->frame_drop[RKISP1_SELFPATH]);
d321afe87aa3ed Laurent Pinchart 2022-02-27  45  }
d321afe87aa3ed Laurent Pinchart 2022-02-27  46  
d321afe87aa3ed Laurent Pinchart 2022-02-27 @47  void rkisp1_debug_cleanup(struct rkisp1_device *rkisp1)

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff mbox series

Patch

diff --git a/drivers/media/platform/rockchip/rkisp1/Makefile b/drivers/media/platform/rockchip/rkisp1/Makefile
index 1a39bdcc608e..c39ab7010c66 100644
--- a/drivers/media/platform/rockchip/rkisp1/Makefile
+++ b/drivers/media/platform/rockchip/rkisp1/Makefile
@@ -1,11 +1,14 @@ 
 # SPDX-License-Identifier: GPL-2.0
 
+rockchip-isp1-y := rkisp1-capture.o \
+		   rkisp1-common.o \
+		   rkisp1-debug.o \
+		   rkisp1-dev.o \
+		   rkisp1-isp.o \
+		   rkisp1-resizer.o \
+		   rkisp1-stats.o \
+		   rkisp1-params.o
+
+rockchip-isp1-$(CONFIG_DEBUG_FS) += rkisp1-debug.o
+
 obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) += rockchip-isp1.o
-rockchip-isp1-objs += 	rkisp1-capture.o \
-			rkisp1-common.o \
-			rkisp1-debug.o \
-			rkisp1-dev.o \
-			rkisp1-isp.o \
-			rkisp1-resizer.o \
-			rkisp1-stats.o \
-			rkisp1-params.o
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index b860eac9a981..fa31b343d1d2 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -518,7 +518,16 @@  void rkisp1_stats_unregister(struct rkisp1_device *rkisp1);
 int rkisp1_params_register(struct rkisp1_device *rkisp1);
 void rkisp1_params_unregister(struct rkisp1_device *rkisp1);
 
+#if IS_ENABLED(CONFIG_DEBUG_FS)
 void rkisp1_debug_init(struct rkisp1_device *rkisp1);
 void rkisp1_debug_cleanup(struct rkisp1_device *rkisp1);
+#else
+static inline void rkisp1_debug_init(struct rkisp1_device *rkisp1)
+{
+}
+static inline void rkisp1_debug_cleanup(struct rkisp1_device *rkisp1)
+{
+}
+#endif
 
 #endif /* _RKISP1_COMMON_H */