| Message ID | 20220319163100.3083-14-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: rkisp1: Misc bug fixes and cleanups | expand |
Hi Laurent,
I love your patch! Yet something to improve:
[auto build test ERROR on 71e6d0608e4d1b79069990c7dacb3600ced28a3b]
url: https://github.com/0day-ci/linux/commits/Laurent-Pinchart/media-rkisp1-Misc-bug-fixes-and-cleanups/20220320-003349
base: 71e6d0608e4d1b79069990c7dacb3600ced28a3b
config: m68k-randconfig-r015-20220320 (https://download.01.org/0day-ci/archive/20220321/202203212003.ngntIuxj-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/11c5c07e897814001cfa8356922aeea602844787
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/20220320-003349
git checkout 11c5c07e897814001cfa8356922aeea602844787
# 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
2521809005c614 Laurent Pinchart 2022-03-19 15
2521809005c614 Laurent Pinchart 2022-03-19 @16 void rkisp1_debug_init(struct rkisp1_device *rkisp1)
2521809005c614 Laurent Pinchart 2022-03-19 17 {
2521809005c614 Laurent Pinchart 2022-03-19 18 struct rkisp1_debug *debug = &rkisp1->debug;
2521809005c614 Laurent Pinchart 2022-03-19 19
2521809005c614 Laurent Pinchart 2022-03-19 20 debug->debugfs_dir = debugfs_create_dir(dev_name(rkisp1->dev), NULL);
2521809005c614 Laurent Pinchart 2022-03-19 21
2521809005c614 Laurent Pinchart 2022-03-19 22 debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir,
2521809005c614 Laurent Pinchart 2022-03-19 23 &debug->data_loss);
2521809005c614 Laurent Pinchart 2022-03-19 24 debugfs_create_ulong("outform_size_err", 0444, debug->debugfs_dir,
2521809005c614 Laurent Pinchart 2022-03-19 25 &debug->outform_size_error);
2521809005c614 Laurent Pinchart 2022-03-19 26 debugfs_create_ulong("img_stabilization_size_error", 0444,
2521809005c614 Laurent Pinchart 2022-03-19 27 debug->debugfs_dir,
2521809005c614 Laurent Pinchart 2022-03-19 28 &debug->img_stabilization_size_error);
2521809005c614 Laurent Pinchart 2022-03-19 29 debugfs_create_ulong("inform_size_error", 0444, debug->debugfs_dir,
2521809005c614 Laurent Pinchart 2022-03-19 30 &debug->inform_size_error);
2521809005c614 Laurent Pinchart 2022-03-19 31 debugfs_create_ulong("irq_delay", 0444, debug->debugfs_dir,
2521809005c614 Laurent Pinchart 2022-03-19 32 &debug->irq_delay);
2521809005c614 Laurent Pinchart 2022-03-19 33 debugfs_create_ulong("mipi_error", 0444, debug->debugfs_dir,
2521809005c614 Laurent Pinchart 2022-03-19 34 &debug->mipi_error);
2521809005c614 Laurent Pinchart 2022-03-19 35 debugfs_create_ulong("stats_error", 0444, debug->debugfs_dir,
2521809005c614 Laurent Pinchart 2022-03-19 36 &debug->stats_error);
2521809005c614 Laurent Pinchart 2022-03-19 37 debugfs_create_ulong("mp_stop_timeout", 0444, debug->debugfs_dir,
2521809005c614 Laurent Pinchart 2022-03-19 38 &debug->stop_timeout[RKISP1_MAINPATH]);
2521809005c614 Laurent Pinchart 2022-03-19 39 debugfs_create_ulong("sp_stop_timeout", 0444, debug->debugfs_dir,
2521809005c614 Laurent Pinchart 2022-03-19 40 &debug->stop_timeout[RKISP1_SELFPATH]);
2521809005c614 Laurent Pinchart 2022-03-19 41 debugfs_create_ulong("mp_frame_drop", 0444, debug->debugfs_dir,
2521809005c614 Laurent Pinchart 2022-03-19 42 &debug->frame_drop[RKISP1_MAINPATH]);
2521809005c614 Laurent Pinchart 2022-03-19 43 debugfs_create_ulong("sp_frame_drop", 0444, debug->debugfs_dir,
2521809005c614 Laurent Pinchart 2022-03-19 44 &debug->frame_drop[RKISP1_SELFPATH]);
2521809005c614 Laurent Pinchart 2022-03-19 45 }
2521809005c614 Laurent Pinchart 2022-03-19 46
2521809005c614 Laurent Pinchart 2022-03-19 @47 void rkisp1_debug_cleanup(struct rkisp1_device *rkisp1)
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 07a92ed8bdc8..a7ffe2830fa8 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 */
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(-)