Commit 72b23dd2 authored by Corentin Labbe's avatar Corentin Labbe Committed by Mauro Carvalho Chehab
Browse files

media: zoran: remove proc_fs 



The zoran driver give some debug information in procfs, but this is not
the right place.
So let's remove them, we will use debugfs 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+huawei@kernel.org>
parent ff559599

drivers/staging/media/zoran/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

zr36067-objs	:=	zoran_procfs.o zoran_device.o \

zr36067-objs	:=	zoran_device.o \

			zoran_driver.o zoran_card.o



obj-$(CONFIG_VIDEO_ZORAN) += zr36067.o videocodec.o

drivers/staging/media/zoran/zoran.h

+0 −5
Original line number Diff line number Diff line
@@ -346,11 +346,6 @@ struct zoran { 
	struct zoran_buffer_col jpg_buffers;	/* MJPEG buffers' info */



	/* Additional stuff for testing */

#ifdef CONFIG_PROC_FS

	struct proc_dir_entry *zoran_proc;

#else

	void *zoran_proc;

#endif

	int testing;

	int jpeg_error;

	int intr_counter_GIRQ1;

drivers/staging/media/zoran/zoran_card.c

+0 −6
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/vmalloc.h>

#include <linux/slab.h>



#include <linux/proc_fs.h>

#include <linux/i2c.h>

#include <linux/i2c-algo-bit.h>

#include <linux/videodev2.h>
@@ -38,7 +37,6 @@ 
#include "zoran.h"

#include "zoran_card.h"

#include "zoran_device.h"

#include "zoran_procfs.h"



extern const struct zoran_format zoran_formats[];
@@ -978,7 +976,6 @@ static int zr36057_init(struct zoran *zr) 
		encoder_call(zr, video, s_routing, 2, 0, 0);

	}



	zr->zoran_proc = NULL;

	zr->initialized = 1;

	return 0;
@@ -1019,7 +1016,6 @@ static void zoran_remove(struct pci_dev *pdev) 
	free_irq(zr->pci_dev->irq, zr);

	/* unmap and free memory */

	kfree(zr->stat_com);

	zoran_proc_cleanup(zr);

	iounmap(zr->zr36057_mem);

	pci_disable_device(zr->pci_dev);

	video_unregister_device(zr->video_dev);
@@ -1280,8 +1276,6 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (zr36057_init(zr) < 0)

		goto zr_detach_vfe;



	zoran_proc_init(zr);



	return 0;



zr_detach_vfe:

drivers/staging/media/zoran/zoran_device.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/sched/signal.h>



#include <linux/interrupt.h>

#include <linux/proc_fs.h>

#include <linux/i2c.h>

#include <linux/i2c-algo-bit.h>

#include <linux/videodev2.h>

drivers/staging/media/zoran/zoran_driver.c

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 
#include <asm/byteorder.h>

#include <linux/io.h>

#include <linux/uaccess.h>

#include <linux/proc_fs.h>



#include <linux/mutex.h>

#include "zoran.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE