Commit cb77d010 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (6586): Remove some dead code and make drive fully V4L2 compatible 



There were some vestiges of an old V4L1 I2C driver that were called by em28xx.
This patch removes this dead code, and replaces videodev.h to videodev2.h

Now, this driver doesn't require V4L1 anymore.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 195a4ef6

drivers/media/video/em28xx/Kconfig

+1 −1
Original line number Diff line number Diff line 
config VIDEO_EM28XX

	tristate "Empia EM2800/2820/2840 USB video capture support"

	depends on VIDEO_V4L1 && I2C && INPUT

	depends on VIDEO_DEV && I2C && INPUT

	select VIDEO_TUNER

	select VIDEO_TVEEPROM

	select VIDEO_IR

drivers/media/video/em28xx/em28xx-video.c

+0 −10
Original line number Diff line number Diff line
@@ -1675,16 +1675,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, 
	dev->em28xx_read_reg_req = em28xx_read_reg_req;

	dev->is_em2800 = em28xx_boards[dev->model].is_em2800;



	/* setup video picture settings for saa7113h */

	memset(&dev->vpic, 0, sizeof(dev->vpic));

	dev->vpic.colour = 128 << 8;

	dev->vpic.hue = 128 << 8;

	dev->vpic.brightness = 128 << 8;

	dev->vpic.contrast = 192 << 8;

	dev->vpic.whiteness = 128 << 8;	/* This one isn't used */

	dev->vpic.depth = 16;

	dev->vpic.palette = VIDEO_PALETTE_YUV422;



	em28xx_pre_card_setup(dev);



	errCode = em28xx_config(dev);

drivers/media/video/em28xx/em28xx.h

+1 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#ifndef _EM28XX_H

#define _EM28XX_H



#include <linux/videodev.h>

#include <linux/videodev2.h>

#include <linux/i2c.h>

#include <linux/mutex.h>

#include <media/ir-kbd-i2c.h>
@@ -239,7 +239,6 @@ struct em28xx { 
	/* video for linux */

	int users;		/* user count for exclusive use */

	struct video_device *vdev;	/* video for linux device struct */

	struct video_picture vpic;	/* picture settings only used to init saa7113h */

	struct em28xx_tvnorm *tvnorm;	/* selected tv norm */

	int ctl_freq;		/* selected frequency */

	unsigned int ctl_input;	/* selected input */