media: rkisp1: Move debugfs code to a separate file

To avoid cluttering the main rkisp1-dev.c driver file, move debugfs code
to a separate source file. This prepares for extensions to the debugfs
infrastructure.

While at it, add a missing forward declaration for struct dentry in
rkisp1-common.h to avoid depending on indirect includes.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Dafna Hirschfeld <dafna@fastmail.com>
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/rockchip/rkisp1/Makefile b/drivers/media/platform/rockchip/rkisp1/Makefile
index ab32a77..1a39bdc 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/Makefile
+++ b/drivers/media/platform/rockchip/rkisp1/Makefile
@@ -3,6 +3,7 @@
 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 \

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index 3b36ab0..07a92ed 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -23,6 +23,8 @@
 
 #include "rkisp1-regs.h"
 
+struct dentry;
+
 /*
  * flags on the 'direction' field in struct 'rkisp1_isp_mbus_info' that indicate
  * on which pad the media bus format is supported
@@ -516,4 +518,7 @@ void rkisp1_stats_unregister(struct rkisp1_device *rkisp1);
 int rkisp1_params_register(struct rkisp1_device *rkisp1);
 void rkisp1_params_unregister(struct rkisp1_device *rkisp1);
 
+void rkisp1_debug_init(struct rkisp1_device *rkisp1);
+void rkisp1_debug_cleanup(struct rkisp1_device *rkisp1);
+
 #endif /* _RKISP1_COMMON_H */

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c
new file mode 100644 (file)
index 0000000..64b3377
--- /dev/null
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-debug.c
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Rockchip ISP1 Driver - Base driver
+ *
+ * Copyright (C) 2019 Collabora, Ltd.
+ *
+ * Based on Rockchip ISP1 driver by Rockchip Electronics Co., Ltd.
+ * Copyright (C) 2017 Rockchip Electronics Co., Ltd.
+ */
+
+#include <linux/debugfs.h>
+#include <linux/device.h>
+
+#include "rkisp1-common.h"
+
+void rkisp1_debug_init(struct rkisp1_device *rkisp1)
+{
+       struct rkisp1_debug *debug = &rkisp1->debug;
+
+       debug->debugfs_dir = debugfs_create_dir(dev_name(rkisp1->dev), NULL);
+
+       debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir,
+                            &debug->data_loss);
+       debugfs_create_ulong("outform_size_err", 0444,  debug->debugfs_dir,
+                            &debug->outform_size_error);
+       debugfs_create_ulong("img_stabilization_size_error", 0444,
+                            debug->debugfs_dir,
+                            &debug->img_stabilization_size_error);
+       debugfs_create_ulong("inform_size_error", 0444,  debug->debugfs_dir,
+                            &debug->inform_size_error);
+       debugfs_create_ulong("irq_delay", 0444,  debug->debugfs_dir,
+                            &debug->irq_delay);
+       debugfs_create_ulong("mipi_error", 0444, debug->debugfs_dir,
+                            &debug->mipi_error);
+       debugfs_create_ulong("stats_error", 0444, debug->debugfs_dir,
+                            &debug->stats_error);
+       debugfs_create_ulong("mp_stop_timeout", 0444, debug->debugfs_dir,
+                            &debug->stop_timeout[RKISP1_MAINPATH]);
+       debugfs_create_ulong("sp_stop_timeout", 0444, debug->debugfs_dir,
+                            &debug->stop_timeout[RKISP1_SELFPATH]);
+       debugfs_create_ulong("mp_frame_drop", 0444, debug->debugfs_dir,
+                            &debug->frame_drop[RKISP1_MAINPATH]);
+       debugfs_create_ulong("sp_frame_drop", 0444, debug->debugfs_dir,
+                            &debug->frame_drop[RKISP1_SELFPATH]);
+}
+
+void rkisp1_debug_cleanup(struct rkisp1_device *rkisp1)
+{
+       debugfs_remove_recursive(rkisp1->debug.debugfs_dir);
+}

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
index f8b2573..c7ad198 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
@@ -9,7 +9,6 @@
  */
 
 #include <linux/clk.h>
-#include <linux/debugfs.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/of.h>
@@ -460,36 +459,6 @@ static const struct of_device_id rkisp1_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, rkisp1_of_match);
 
-static void rkisp1_debug_init(struct rkisp1_device *rkisp1)
-{
-       struct rkisp1_debug *debug = &rkisp1->debug;
-
-       debug->debugfs_dir = debugfs_create_dir(dev_name(rkisp1->dev), NULL);
-       debugfs_create_ulong("data_loss", 0444, debug->debugfs_dir,
-                            &debug->data_loss);
-       debugfs_create_ulong("outform_size_err", 0444,  debug->debugfs_dir,
-                            &debug->outform_size_error);
-       debugfs_create_ulong("img_stabilization_size_error", 0444,
-                            debug->debugfs_dir,
-                            &debug->img_stabilization_size_error);
-       debugfs_create_ulong("inform_size_error", 0444,  debug->debugfs_dir,
-                            &debug->inform_size_error);
-       debugfs_create_ulong("irq_delay", 0444,  debug->debugfs_dir,
-                            &debug->irq_delay);
-       debugfs_create_ulong("mipi_error", 0444, debug->debugfs_dir,
-                            &debug->mipi_error);
-       debugfs_create_ulong("stats_error", 0444, debug->debugfs_dir,
-                            &debug->stats_error);
-       debugfs_create_ulong("mp_stop_timeout", 0444, debug->debugfs_dir,
-                            &debug->stop_timeout[RKISP1_MAINPATH]);
-       debugfs_create_ulong("sp_stop_timeout", 0444, debug->debugfs_dir,
-                            &debug->stop_timeout[RKISP1_SELFPATH]);
-       debugfs_create_ulong("mp_frame_drop", 0444, debug->debugfs_dir,
-                            &debug->frame_drop[RKISP1_MAINPATH]);
-       debugfs_create_ulong("sp_frame_drop", 0444, debug->debugfs_dir,
-                            &debug->frame_drop[RKISP1_SELFPATH]);
-}
-
 static int rkisp1_probe(struct platform_device *pdev)
 {
        const struct rkisp1_match_data *match_data;
@@ -586,13 +555,13 @@ static int rkisp1_remove(struct platform_device *pdev)
        v4l2_async_nf_cleanup(&rkisp1->notifier);
 
        rkisp1_entities_unregister(rkisp1);
+       rkisp1_debug_cleanup(rkisp1);
 
        media_device_unregister(&rkisp1->media_dev);
        v4l2_device_unregister(&rkisp1->v4l2_dev);
 
        pm_runtime_disable(&pdev->dev);
 
-       debugfs_remove_recursive(rkisp1->debug.debugfs_dir);
        return 0;
 }