From: Corentin Labbe <clabbe@baylibre.com>
To: mchehab@kernel.org, hverkuil@xs4all.nl, gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-staging@lists.linux.dev, mjpeg-users@lists.sourceforge.net,
Corentin Labbe <clabbe@baylibre.com>
Subject: [PATCH v4 05/18] staging: media: zoran: videocode: remove procfs
Date: Tue, 14 Dec 2021 16:16:23 +0000 [thread overview]
Message-ID: <20211214161636.1886900-6-clabbe@baylibre.com> (raw)
In-Reply-To: <20211214161636.1886900-1-clabbe@baylibre.com>
Now we have a debugfs, we can remove all PROCFS stuff.
We keep videocodec_debugfs_show(), it will be used later
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
drivers/staging/media/zoran/videocodec.c | 24 +-----------------------
drivers/staging/media/zoran/videocodec.h | 3 +++
2 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/drivers/staging/media/zoran/videocodec.c b/drivers/staging/media/zoran/videocodec.c
index 31019b5f377e..5bab7ba56257 100644
--- a/drivers/staging/media/zoran/videocodec.c
+++ b/drivers/staging/media/zoran/videocodec.c
@@ -16,14 +16,6 @@
#include <linux/types.h>
#include <linux/slab.h>
-// kernel config is here (procfs flag)
-
-#ifdef CONFIG_PROC_FS
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/uaccess.h>
-#endif
-
#include "videocodec.h"
static int videocodec_debug;
@@ -265,8 +257,7 @@ int videocodec_unregister(const struct videocodec *codec)
}
EXPORT_SYMBOL(videocodec_unregister);
-#ifdef CONFIG_PROC_FS
-static int proc_videocodecs_show(struct seq_file *m, void *v)
+int videocodec_debugfs_show(struct seq_file *m)
{
struct codec_list *h = codeclist_top;
struct attached_list *a;
@@ -293,32 +284,19 @@ static int proc_videocodecs_show(struct seq_file *m, void *v)
return 0;
}
-#endif
/* ===================== */
/* hook in driver module */
/* ===================== */
static int __init videocodec_init(void)
{
-#ifdef CONFIG_PROC_FS
- static struct proc_dir_entry *videocodec_proc_entry;
-#endif
-
pr_info("Linux video codec intermediate layer: %s\n", VIDEOCODEC_VERSION);
-#ifdef CONFIG_PROC_FS
- videocodec_proc_entry = proc_create_single("videocodecs", 0, NULL, proc_videocodecs_show);
- if (!videocodec_proc_entry)
- pr_err("videocodec: can't init procfs.\n");
-#endif
return 0;
}
static void __exit videocodec_exit(void)
{
-#ifdef CONFIG_PROC_FS
- remove_proc_entry("videocodecs", NULL);
-#endif
}
module_init(videocodec_init);
diff --git a/drivers/staging/media/zoran/videocodec.h b/drivers/staging/media/zoran/videocodec.h
index 8a5003dda9f4..3a508d326049 100644
--- a/drivers/staging/media/zoran/videocodec.h
+++ b/drivers/staging/media/zoran/videocodec.h
@@ -123,6 +123,7 @@ M zr36055[1] 0001 0000c001 00000000 (zr36050[1])
#ifndef __LINUX_VIDEOCODEC_H
#define __LINUX_VIDEOCODEC_H
+#include <linux/debugfs.h>
#include <linux/videodev2.h>
#define CODEC_DO_COMPRESSION 0
@@ -305,4 +306,6 @@ extern int videocodec_unregister(const struct videocodec *);
/* the other calls are directly done via the videocodec structure! */
+int videocodec_debugfs_show(struct seq_file *m);
+
#endif /*ifndef __LINUX_VIDEOCODEC_H */
--
2.32.0
next prev parent reply other threads:[~2021-12-14 16:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-14 16:16 [PATCH v4 00/18] staging: media: zoran: merge in one module Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 01/18] staging: media: zoran: move module parameter checks to zoran_probe Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 02/18] staging: media: zoran: use module_pci_driver Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 03/18] staging: media: zoran: rename debug module parameter Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 04/18] staging: media: zoran: add debugfs Corentin Labbe
2021-12-14 16:16 ` Corentin Labbe [this message]
2021-12-14 16:16 ` [PATCH v4 06/18] staging: media: zoran: merge all modules Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 07/18] staging: media: zoran: remove vidmem Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 08/18] staging: media: zoran: move videodev alloc Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 09/18] staging: media: zoran: move config select on primary kconfig Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 10/18] staging: media: zoran: introduce zoran_i2c_init Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 11/18] staging: media: zoran: fix usage of vb2_dma_contig_set_max_seg_size Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 12/18] staging: media: zoran: clean unused code Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 13/18] staging: media: zoran: fix counting buffer in reserve Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 14/18] staging: media: zoran: calculate the right buffer number for zoran_reap_stat_com Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 15/18] staging: media: zoran: fix various V4L2 compliance errors Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 16/18] staging: media: zoran: fix TRY_FMT handling Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 17/18] staging: media: zoran: drop kernel log spam Corentin Labbe
2021-12-14 16:16 ` [PATCH v4 18/18] staging: media: zoran: drop read/write support Corentin Labbe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211214161636.1886900-6-clabbe@baylibre.com \
--to=clabbe@baylibre.com \
--cc=gregkh@linuxfoundation.org \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=mchehab@kernel.org \
--cc=mjpeg-users@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®