Commit 12b65d5c authored by Corentin Labbe's avatar Corentin Labbe Committed by Mauro Carvalho Chehab

media: staging: media: zoran: videocode: remove procfs

Now we have a debugfs, we can remove all PROCFS stuff.
We keep videocodec_debugfs_show(), it will be used later
Signed-off-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 2776d278
...@@ -16,14 +16,6 @@ ...@@ -16,14 +16,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/slab.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" #include "videocodec.h"
static int videocodec_debug; static int videocodec_debug;
...@@ -265,8 +257,7 @@ int videocodec_unregister(const struct videocodec *codec) ...@@ -265,8 +257,7 @@ int videocodec_unregister(const struct videocodec *codec)
} }
EXPORT_SYMBOL(videocodec_unregister); EXPORT_SYMBOL(videocodec_unregister);
#ifdef CONFIG_PROC_FS int videocodec_debugfs_show(struct seq_file *m)
static int proc_videocodecs_show(struct seq_file *m, void *v)
{ {
struct codec_list *h = codeclist_top; struct codec_list *h = codeclist_top;
struct attached_list *a; struct attached_list *a;
...@@ -293,32 +284,19 @@ static int proc_videocodecs_show(struct seq_file *m, void *v) ...@@ -293,32 +284,19 @@ static int proc_videocodecs_show(struct seq_file *m, void *v)
return 0; return 0;
} }
#endif
/* ===================== */ /* ===================== */
/* hook in driver module */ /* hook in driver module */
/* ===================== */ /* ===================== */
static int __init videocodec_init(void) 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); 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; return 0;
} }
static void __exit videocodec_exit(void) static void __exit videocodec_exit(void)
{ {
#ifdef CONFIG_PROC_FS
remove_proc_entry("videocodecs", NULL);
#endif
} }
module_init(videocodec_init); module_init(videocodec_init);
......
...@@ -123,6 +123,7 @@ M zr36055[1] 0001 0000c001 00000000 (zr36050[1]) ...@@ -123,6 +123,7 @@ M zr36055[1] 0001 0000c001 00000000 (zr36050[1])
#ifndef __LINUX_VIDEOCODEC_H #ifndef __LINUX_VIDEOCODEC_H
#define __LINUX_VIDEOCODEC_H #define __LINUX_VIDEOCODEC_H
#include <linux/debugfs.h>
#include <linux/videodev2.h> #include <linux/videodev2.h>
#define CODEC_DO_COMPRESSION 0 #define CODEC_DO_COMPRESSION 0
...@@ -305,4 +306,6 @@ extern int videocodec_unregister(const struct videocodec *); ...@@ -305,4 +306,6 @@ extern int videocodec_unregister(const struct videocodec *);
/* the other calls are directly done via the videocodec structure! */ /* the other calls are directly done via the videocodec structure! */
int videocodec_debugfs_show(struct seq_file *m);
#endif /*ifndef __LINUX_VIDEOCODEC_H */ #endif /*ifndef __LINUX_VIDEOCODEC_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment